Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3848/1: pxafb: Add option of fixing video modes and spitz QVGA mode support
  [ARM] 3880/1: remove the last trace of iop31x support
  [ARM] 3879/1: ep93xx: instantiate platform devices for ep93xx ethernet
  [ARM] 3809/3: get rid of 4 megabyte kernel image size limit
  [ARM] Fix XIP_KERNEL build error in arch/arm/mm/mmu.c
  [ARM] 3874/1: Remove leftover usage of asm/timeofday.h

1 files changed, 30 insertions, 0 deletions

diff --git a/arch/arm/mach-ep93xx/edb9315a.c b/arch/arm/mach-ep93xx/edb9315a.c
index bfefdaa8f794..fa958e9d6ddd 100644
--- a/arch/arm/mach-ep93xx/edb9315a.c
+++ b/arch/arm/mach-ep93xx/edb9315a.c
@@ -44,10 +44,40 @@ static struct platform_device edb9315a_flash = {
         .resource       = &edb9315a_flash_resource,
 };
 
+static struct ep93xx_eth_data edb9315a_eth_data = {
+        .phy_id                 = 1,
+};
+
+static struct resource edb9315a_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 edb9315a_eth_device = {
+        .name           = "ep93xx-eth",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &edb9315a_eth_data,
+        },
+        .num_resources  = 2,
+        .resource       = edb9315a_eth_resource,
+};
+
 static void __init edb9315a_init_machine(void)
 {
         ep93xx_init_devices();
         platform_device_register(&edb9315a_flash);
+
+        memcpy(edb9315a_eth_data.dev_addr,
+                (void *)(EP93XX_ETHERNET_BASE + 0x50), 6);
+        platform_device_register(&edb9315a_eth_device);
 }
 
 MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board")