Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-x86/statfs.h

1 files changed, 2 insertions, 26 deletions

diff --git a/arch/arm/mach-ep93xx/edb9302a.c b/arch/arm/mach-ep93xx/edb9302a.c
index 99b01d44bf1c..02c4405afed7 100644
--- a/arch/arm/mach-ep93xx/edb9302a.c
+++ b/arch/arm/mach-ep93xx/edb9302a.c
@@ -18,7 +18,7 @@
 #include <linux/ioport.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -47,36 +47,12 @@ static struct ep93xx_eth_data edb9302a_eth_data = {
         .phy_id                 = 1,
 };
 
-static struct resource edb9302a_eth_resource[] = {
-        {
-                .start  = EP93XX_ETHERNET_PHYS_BASE,
-                .end    = EP93XX_ETHERNET_PHYS_BASE + 0xffff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_EP93XX_ETHERNET,
-                .end    = IRQ_EP93XX_ETHERNET,
-                .flags  = IORESOURCE_IRQ,
-        }
-};
-
-static struct platform_device edb9302a_eth_device = {
-        .name           = "ep93xx-eth",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &edb9302a_eth_data,
-        },
-        .num_resources  = 2,
-        .resource       = edb9302a_eth_resource,
-};
-
 static void __init edb9302a_init_machine(void)
 {
         ep93xx_init_devices();
         platform_device_register(&edb9302a_flash);
 
-        memcpy(edb9302a_eth_data.dev_addr,
-                (void *)(EP93XX_ETHERNET_BASE + 0x50), 6);
-        platform_device_register(&edb9302a_eth_device);
+        ep93xx_register_eth(&edb9302a_eth_data, 1);
 }
 
 MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board")