Merge branch 'x86-platform-next' into x86-platform

[pandora-kernel.git] / arch / arm / mach-at91 / include / mach / at91sam9g45.h

diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index a526869..659304a 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h
@@ -18,8 +18,6 @@
 /*
  * Peripheral identifiers/interrupts.
  */
-#define AT91_ID_FIQ            0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS            1       /* System Controller Interrupt */
 #define AT91SAM9G45_ID_PIOA    2       /* Parallel I/O Controller A */
 #define AT91SAM9G45_ID_PIOB    3       /* Parallel I/O Controller B */
 #define AT91SAM9G45_ID_PIOC    4       /* Parallel I/O Controller C */
@@ -131,8 +129,6 @@
 #define AT91SAM9G45_EHCI_BASE  0x00800000      /* USB Host controller (EHCI) */
 #define AT91SAM9G45_VDEC_BASE  0x00900000      /* Video Decoder Controller */
 
-#define CONFIG_DRAM_BASE       AT91_CHIPSELECT_6
-
 #define CONSISTENT_DMA_SIZE    SZ_4M
 
 /*