[ARM] pxa: rename colibri.c to colibri-pxa270.c

[deliverable/linux.git] / arch / arm / mach-pxa / include / mach / colibri.h

diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h
index 2ae373fb567503e6fbe0c3d8b3bfed7c7e3e44b4..c7c99d07881725d4e50411519efabd443134422d 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/colibri.h
+++ b/arch/arm/mach-pxa/include/mach/colibri.h
@@ -2,18 +2,13 @@
 #define _COLIBRI_H_
 
 /* physical memory regions */
-#define COLIBRI_FLASH_PHYS     (PXA_CS0_PHYS)  /* Flash region */
-#define COLIBRI_ETH_PHYS       (PXA_CS2_PHYS)  /* Ethernet DM9000 region */
 #define COLIBRI_SDRAM_BASE     0xa0000000      /* SDRAM region */
 
-/* virtual memory regions */
-#define COLIBRI_DISK_VIRT      0xF0000000      /* Disk On Chip region */
-
-/* size of flash */
-#define COLIBRI_FLASH_SIZE     0x02000000      /* Flash size 32 MB */
-
-/* Ethernet Controller Davicom DM9000 */
-#define GPIO_DM9000            114
-#define COLIBRI_ETH_IRQ        IRQ_GPIO(GPIO_DM9000)
+#define COLIBRI_PXA270_FLASH_PHYS      (PXA_CS0_PHYS)  /* Flash region */
+#define COLIBRI_PXA270_ETH_PHYS                (PXA_CS2_PHYS)  /* Ethernet */
+#define COLIBRI_PXA270_ETH_IRQ_GPIO    114
+#define COLIBRI_PXA270_ETH_IRQ         \
+       gpio_to_irq(mfp_to_gpio(COLIBRI_PXA270_ETH_IRQ_GPIO))
 
 #endif /* _COLIBRI_H_ */
+