Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / arch / arm / mach-iop3xx / iop321-setup.c

diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c
index 80770233b8d40d7970eee8eaf54ed9df2e715da4..b6d096903c4ae65c92eb6826d6c9f8ac3639b28c 100644 (file)
--- a/arch/arm/mach-iop3xx/iop321-setup.c
+++ b/arch/arm/mach-iop3xx/iop321-setup.c
@@ -12,8 +12,6 @@
  */
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <linux/config.h>
-#include <linux/init.h>
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/platform_device.h>
@@ -151,7 +149,6 @@ extern void iop321_init_time(void);
 #if defined(CONFIG_ARCH_IQ80321)
 MACHINE_START(IQ80321, "Intel IQ80321")
        /* Maintainer: Intel Corporation */
-       .phys_ram       = PHYS_OFFSET,
        .phys_io        = IQ80321_UART,
        .io_pg_offst    = ((IQ80321_UART) >> 18) & 0xfffc,
        .map_io         = iq80321_map_io,
@@ -163,7 +160,6 @@ MACHINE_END
 #elif defined(CONFIG_ARCH_IQ31244)
 MACHINE_START(IQ31244, "Intel IQ31244")
        /* Maintainer: Intel Corp. */
-       .phys_ram       = PHYS_OFFSET,
        .phys_io        = IQ31244_UART,
        .io_pg_offst    = ((IQ31244_UART) >> 18) & 0xfffc,
        .map_io         = iq31244_map_io,