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, 4 insertions, 25 deletions

diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c
index 9b41ec1f089e..035b24e31b64 100644
--- a/arch/arm/mach-ep93xx/gesbc9312.c
+++ b/arch/arm/mach-ep93xx/gesbc9312.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>
@@ -44,36 +44,15 @@ static struct platform_device gesbc9312_flash = {
 };
 
 static struct ep93xx_eth_data gesbc9312_eth_data = {
-        .phy_id                 = 1,
-};
-
-static struct resource gesbc9312_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 gesbc9312_eth_device = {
-        .name           = "ep93xx-eth",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &gesbc9312_eth_data,
-        },
-        .num_resources  = 2,
-        .resource       = gesbc9312_eth_resource,
+        .phy_id         = 1,
 };
 
 static void __init gesbc9312_init_machine(void)
 {
         ep93xx_init_devices();
         platform_device_register(&gesbc9312_flash);
-        platform_device_register(&gesbc9312_eth_device);
+
+        ep93xx_register_eth(&gesbc9312_eth_data, 0);
 }
 
 MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")