Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / board-perseus2.h

diff --git a/include/asm-arm/arch-omap/board-perseus2.h b/include/asm-arm/arch-omap/board-perseus2.h
index 691e52a52b433f4fe5cf43e9feeabefdd03e04ee..d7429cb0f72613b411bd2f2eda3c9ed8f3606a29 100644 (file)
--- a/include/asm-arm/arch-omap/board-perseus2.h
+++ b/include/asm-arm/arch-omap/board-perseus2.h
@@ -36,14 +36,4 @@
 #define OMAP_SDRAM_DEVICE              D256M_1X16_4B
 #endif
 
-#define MAXIRQNUM              IH_BOARD_BASE
-#define MAXFIQNUM              MAXIRQNUM
-#define MAXSWINUM              MAXIRQNUM
-
-#define NR_IRQS                        (MAXIRQNUM + 1)
-
-/* Samsung NAND flash at CS2B or CS3(NAND Boot) */
-#define OMAP_NAND_FLASH_START1    0x0A000000 /* CS2B */
-#define OMAP_NAND_FLASH_START2    0x0C000000 /* CS3 */
-
 #endif