Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-pxa / include / mach / pxa3xx-regs.h

diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
index e91d63cfe811f081aa968c48c7075144593ff823..e4fb4668c26e92646119eea5181ad25d5ec746bb 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
+++ b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
@@ -15,15 +15,6 @@
 
 #include <mach/hardware.h>
 
-/*
- * Static Chip Selects
- */
-
-#define PXA300_CS0_PHYS                (0x00000000)    /* PXA300/PXA310 _only_ */
-#define PXA300_CS1_PHYS                (0x30000000)    /* PXA300/PXA310 _only_ */
-#define PXA3xx_CS2_PHYS                (0x10000000)
-#define PXA3xx_CS3_PHYS                (0x14000000)
-
 /*
  * Oscillator Configuration Register (OSCC)
  */