Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
  [AVR32] Add missing #include <linux/param.h> to delay.c
  [AVR32] Pass dev parameter to dma_cache_sync()
  [AVR32] Implement intc_get_pending()
  [AVR32] Don't include <asm/delay.h>
  [AVR32] Put the chip in "stop" mode when halting the system
  [AVR32] Set flow handler for external interrupts
  [AVR32] Remove unused file
  [AVR32] Remove mii_phy_addr and eth_addr from eth_platform_data
  [AVR32] Move ethernet tag parsing to board-specific code
  [AVR32] Add macb1 platform_device
  [AVR32] Portmux API update

1 files changed, 0 insertions, 24 deletions

diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index ea2d1ffee478..a34211601008 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -229,30 +229,6 @@ static int __init parse_tag_rsvd_mem(struct tag *tag)
 }
 __tagtable(ATAG_RSVD_MEM, parse_tag_rsvd_mem);
 
-static int __init parse_tag_ethernet(struct tag *tag)
-{
-#if 0
-        const struct platform_device *pdev;
-
-        /*
-         * We really need a bus type that supports "classes"...this
-         * will do for now (until we must handle other kinds of
-         * ethernet controllers)
-         */
-        pdev = platform_get_device("macb", tag->u.ethernet.mac_index);
-        if (pdev && pdev->dev.platform_data) {
-                struct eth_platform_data *data = pdev->dev.platform_data;
-
-                data->valid = 1;
-                data->mii_phy_addr = tag->u.ethernet.mii_phy_addr;
-                memcpy(data->hw_addr, tag->u.ethernet.hw_address,
-                       sizeof(data->hw_addr));
-        }
-#endif
-        return 0;
-}
-__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
-
 /*
  * Scan the tag table for this tag, and call its parse function. The
  * tag table is built by the linker from all the __tagtable