From 92dd4fee15cb7c33868c7d7213f82136955397b1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 May 2010 14:29:22 +0200 Subject: upgrade all targets to Linux 2.6.34 --- target/rb4xx/patches/ar71xx.patch | 987 +++++++++++++++++--------------------- target/rb4xx/target.mk | 4 +- 2 files changed, 454 insertions(+), 537 deletions(-) (limited to 'target/rb4xx') diff --git a/target/rb4xx/patches/ar71xx.patch b/target/rb4xx/patches/ar71xx.patch index b0a342dfa..477c9e611 100644 --- a/target/rb4xx/patches/ar71xx.patch +++ b/target/rb4xx/patches/ar71xx.patch @@ -1,6 +1,6 @@ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.33.3/arch/mips/ar71xx/ar71xx.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/ar71xx.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/ar71xx.c 2010-04-02 11:07:51.850954806 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.34/arch/mips/ar71xx/ar71xx.c +--- linux-2.6.34.orig/arch/mips/ar71xx/ar71xx.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/ar71xx.c 2010-05-25 18:46:03.110979012 +0200 @@ -0,0 +1,177 @@ +/* + * AR71xx SoC routines @@ -179,9 +179,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.33.3/arch/mips + mutex_unlock(&ar71xx_flash_mutex); +} +EXPORT_SYMBOL_GPL(ar71xx_flash_release); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-eth.c linux-2.6.33.3/arch/mips/ar71xx/dev-ap91-eth.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-eth.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-ap91-eth.c 2010-03-23 20:31:04.580708993 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-eth.c linux-2.6.34/arch/mips/ar71xx/dev-ap91-eth.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-eth.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-ap91-eth.c 2010-05-25 18:46:03.723464300 +0200 @@ -0,0 +1,70 @@ +/* + * Atheros AP91 reference board ethernet initialization @@ -253,9 +253,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-eth.c linux-2.6.33.3/arc + + ar71xx_add_device_dsa(1, &ap91_dsa_data); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-eth.h linux-2.6.33.3/arch/mips/ar71xx/dev-ap91-eth.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-eth.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-ap91-eth.h 2010-03-12 19:31:46.886045750 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-eth.h linux-2.6.34/arch/mips/ar71xx/dev-ap91-eth.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-eth.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-ap91-eth.h 2010-05-25 18:46:03.783696759 +0200 @@ -0,0 +1,23 @@ +/* + * Atheros AP91 reference board ethernet initialization @@ -280,9 +280,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-eth.h linux-2.6.33.3/arc + +#endif /* _AR71XX_DEV_AP91_ETH_H */ + -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.33.3/arch/mips/ar71xx/dev-ap91-pci.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-ap91-pci.c 2009-12-25 12:10:59.596028998 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.34/arch/mips/ar71xx/dev-ap91-pci.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-ap91-pci.c 2010-05-25 18:46:03.822223125 +0200 @@ -0,0 +1,114 @@ +/* + * Atheros AP91 reference board PCI initialization @@ -398,9 +398,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.33.3/arc + + ap91_pci_fixup_enabled = 1; +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.33.3/arch/mips/ar71xx/dev-ap91-pci.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-pci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-ap91-pci.h 2010-01-05 20:38:52.249392561 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.34/arch/mips/ar71xx/dev-ap91-pci.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-ap91-pci.h 2010-05-25 18:46:03.863464064 +0200 @@ -0,0 +1,21 @@ +/* + * Atheros AP91 reference board PCI initialization @@ -423,9 +423,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.33.3/arc + +#endif /* _AR71XX_DEV_AP91_PCI_H */ + -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.33.3/arch/mips/ar71xx/dev-ap94-pci.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap94-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-ap94-pci.c 2010-02-13 16:30:07.244691791 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.34/arch/mips/ar71xx/dev-ap94-pci.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-ap94-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-ap94-pci.c 2010-05-25 18:46:03.902223120 +0200 @@ -0,0 +1,159 @@ +/* + * Atheros AP94 reference board PCI initialization @@ -586,9 +586,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.33.3/arc + + ap94_pci_fixup_enabled = 1; +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.33.3/arch/mips/ar71xx/dev-ap94-pci.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap94-pci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-ap94-pci.h 2010-02-13 16:30:07.244691791 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.34/arch/mips/ar71xx/dev-ap94-pci.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-ap94-pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-ap94-pci.h 2010-05-25 18:46:03.941521735 +0200 @@ -0,0 +1,28 @@ +/* + * Atheros AP94 reference board PCI initialization @@ -618,9 +618,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.33.3/arc + +#endif /* _AR71XX_DEV_AP94_PCI_H */ + -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.33.3/arch/mips/ar71xx/dev-ar913x-wmac.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ar913x-wmac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-ar913x-wmac.c 2010-03-23 20:31:04.941023040 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.34/arch/mips/ar71xx/dev-ar913x-wmac.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-ar913x-wmac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-ar913x-wmac.c 2010-05-25 18:46:03.983064993 +0200 @@ -0,0 +1,68 @@ +/* + * Atheros AR913x SoC built-in WMAC device support @@ -690,9 +690,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.33.3/ + + platform_device_register(&ar913x_wmac_device); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ar913x-wmac.h linux-2.6.33.3/arch/mips/ar71xx/dev-ar913x-wmac.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ar913x-wmac.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-ar913x-wmac.h 2010-01-05 20:38:52.185278525 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ar913x-wmac.h linux-2.6.34/arch/mips/ar71xx/dev-ar913x-wmac.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-ar913x-wmac.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-ar913x-wmac.h 2010-05-25 18:46:04.023464010 +0200 @@ -0,0 +1,19 @@ +/* + * Atheros AR913x SoC built-in WMAC device support @@ -713,9 +713,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-ar913x-wmac.h linux-2.6.33.3/ +void ar913x_add_device_wmac(u8 *cal_data, u8 *mac_addr) __init; + +#endif /* _AR71XX_DEV_AR913X_WMAC_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-dsa.c linux-2.6.33.3/arch/mips/ar71xx/dev-dsa.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-dsa.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-dsa.c 2010-01-05 20:38:52.058900684 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-dsa.c linux-2.6.34/arch/mips/ar71xx/dev-dsa.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-dsa.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-dsa.c 2010-05-25 18:46:04.063473081 +0200 @@ -0,0 +1,50 @@ +/* + * Atheros AR71xx DSA switch device support @@ -767,9 +767,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-dsa.c linux-2.6.33.3/arch/mip + + platform_device_register(&ar71xx_dsa_switch_device); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-dsa.h linux-2.6.33.3/arch/mips/ar71xx/dev-dsa.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-dsa.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-dsa.h 2010-01-05 20:38:52.137278273 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-dsa.h linux-2.6.34/arch/mips/ar71xx/dev-dsa.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-dsa.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-dsa.h 2010-05-25 18:46:04.100970143 +0200 @@ -0,0 +1,20 @@ +/* + * Atheros AR71xx DSA switch device support @@ -791,9 +791,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-dsa.h linux-2.6.33.3/arch/mip + struct dsa_platform_data *d) __init; + +#endif /* _AR71XX_DEV_DSA_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-gpio-buttons.c linux-2.6.33.3/arch/mips/ar71xx/dev-gpio-buttons.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-gpio-buttons.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-gpio-buttons.c 2010-01-05 20:38:52.310262885 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-gpio-buttons.c linux-2.6.34/arch/mips/ar71xx/dev-gpio-buttons.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-gpio-buttons.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-gpio-buttons.c 2010-05-25 18:46:04.200967942 +0200 @@ -0,0 +1,58 @@ +/* + * Atheros AR71xx GPIO button support @@ -853,9 +853,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-gpio-buttons.c linux-2.6.33.3 +err_free_buttons: + kfree(p); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-gpio-buttons.h linux-2.6.33.3/arch/mips/ar71xx/dev-gpio-buttons.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-gpio-buttons.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-gpio-buttons.h 2010-01-05 20:38:52.385278021 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-gpio-buttons.h linux-2.6.34/arch/mips/ar71xx/dev-gpio-buttons.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-gpio-buttons.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-gpio-buttons.h 2010-05-25 18:46:04.242223118 +0200 @@ -0,0 +1,25 @@ +/* + * Atheros AR71xx GPIO button support @@ -882,9 +882,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-gpio-buttons.h linux-2.6.33.3 + struct gpio_button *buttons) __init; + +#endif /* _AR71XX_DEV_GPIO_BUTTONS_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/devices.c linux-2.6.33.3/arch/mips/ar71xx/devices.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/devices.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/devices.c 2010-04-02 11:07:51.658955496 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/devices.c linux-2.6.34/arch/mips/ar71xx/devices.c +--- linux-2.6.34.orig/arch/mips/ar71xx/devices.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/devices.c 2010-05-25 18:46:04.280978624 +0200 @@ -0,0 +1,575 @@ +/* + * Atheros AR71xx SoC platform devices @@ -1461,9 +1461,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/devices.c linux-2.6.33.3/arch/mip + return 1; +} +__setup("kmac=", ar71xx_kmac_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/devices.h linux-2.6.33.3/arch/mips/ar71xx/devices.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/devices.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/devices.h 2010-01-05 20:38:52.093279648 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/devices.h linux-2.6.34/arch/mips/ar71xx/devices.h +--- linux-2.6.34.orig/arch/mips/ar71xx/devices.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/devices.h 2010-05-25 18:46:04.736028570 +0200 @@ -0,0 +1,48 @@ +/* + * Atheros AR71xx SoC device definitions @@ -1513,10 +1513,10 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/devices.h linux-2.6.33.3/arch/mip +void ar71xx_add_device_wdt(void) __init; + +#endif /* __AR71XX_DEVICES_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-leds-gpio.c linux-2.6.33.3/arch/mips/ar71xx/dev-leds-gpio.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-leds-gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-leds-gpio.c 2010-01-05 20:38:51.933280770 +0100 -@@ -0,0 +1,56 @@ +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-leds-gpio.c linux-2.6.34/arch/mips/ar71xx/dev-leds-gpio.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-leds-gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-leds-gpio.c 2010-05-25 19:12:50.194723129 +0200 +@@ -0,0 +1,57 @@ +/* + * Atheros AR71xx GPIO LED device support + * @@ -1532,6 +1532,7 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-leds-gpio.c linux-2.6.33.3/ar + +#include +#include ++#include + +#include "dev-leds-gpio.h" + @@ -1573,9 +1574,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-leds-gpio.c linux-2.6.33.3/ar +err_free_leds: + kfree(p); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-leds-gpio.h linux-2.6.33.3/arch/mips/ar71xx/dev-leds-gpio.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-leds-gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-leds-gpio.h 2010-01-05 20:38:51.937279883 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-leds-gpio.h linux-2.6.34/arch/mips/ar71xx/dev-leds-gpio.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-leds-gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-leds-gpio.h 2010-05-25 18:46:04.812922530 +0200 @@ -0,0 +1,21 @@ +/* + * Atheros AR71xx GPIO LED device support @@ -1598,9 +1599,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-leds-gpio.h linux-2.6.33.3/ar + struct gpio_led *leds) __init; + +#endif /* _AR71XX_DEV_LEDS_GPIO_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-m25p80.c linux-2.6.33.3/arch/mips/ar71xx/dev-m25p80.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-m25p80.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-m25p80.c 2009-12-25 12:10:59.660426865 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-m25p80.c linux-2.6.34/arch/mips/ar71xx/dev-m25p80.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-m25p80.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-m25p80.c 2010-05-25 18:46:04.852223056 +0200 @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2009 Gabor Juhos @@ -1632,9 +1633,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-m25p80.c linux-2.6.33.3/arch/ + ar71xx_add_device_spi(NULL, ar71xx_spi_info, + ARRAY_SIZE(ar71xx_spi_info)); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-m25p80.h linux-2.6.33.3/arch/mips/ar71xx/dev-m25p80.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-m25p80.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-m25p80.h 2009-12-25 12:10:59.660426865 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-m25p80.h linux-2.6.34/arch/mips/ar71xx/dev-m25p80.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-m25p80.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-m25p80.h 2010-05-25 18:46:04.892223453 +0200 @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2009 Gabor Juhos @@ -1652,9 +1653,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-m25p80.h linux-2.6.33.3/arch/ +void ar71xx_add_device_m25p80(struct flash_platform_data *pdata) __init; + +#endif /* _AR71XX_DEV_M25P80_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb42-pci.c linux-2.6.33.3/arch/mips/ar71xx/dev-pb42-pci.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb42-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-pb42-pci.c 2010-01-05 20:38:52.185278525 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-pb42-pci.c linux-2.6.34/arch/mips/ar71xx/dev-pb42-pci.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-pb42-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-pb42-pci.c 2010-05-25 18:46:04.932223237 +0200 @@ -0,0 +1,40 @@ +/* + * Atheros PB42 reference board PCI initialization @@ -1696,9 +1697,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb42-pci.c linux-2.6.33.3/arc +{ + ar71xx_pci_init(ARRAY_SIZE(pb42_pci_irqs), pb42_pci_irqs); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb42-pci.h linux-2.6.33.3/arch/mips/ar71xx/dev-pb42-pci.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb42-pci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-pb42-pci.h 2010-01-05 20:38:52.217277854 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-pb42-pci.h linux-2.6.34/arch/mips/ar71xx/dev-pb42-pci.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-pb42-pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-pb42-pci.h 2010-05-25 18:46:04.972223148 +0200 @@ -0,0 +1,21 @@ +/* + * Atheros PB42 reference board PCI initialization @@ -1721,9 +1722,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb42-pci.h linux-2.6.33.3/arc +#endif + +#endif /* _AR71XX_DEV_PB42_PCI_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb9x-pci.c linux-2.6.33.3/arch/mips/ar71xx/dev-pb9x-pci.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb9x-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-pb9x-pci.c 2010-04-02 11:07:51.650955594 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-pb9x-pci.c linux-2.6.34/arch/mips/ar71xx/dev-pb9x-pci.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-pb9x-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-pb9x-pci.c 2010-05-25 18:46:05.003473097 +0200 @@ -0,0 +1,33 @@ +/* + * Atheros PB9x reference board PCI initialization @@ -1758,9 +1759,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb9x-pci.c linux-2.6.33.3/arc +{ + ar71xx_pci_init(ARRAY_SIZE(pb9x_pci_irqs), pb9x_pci_irqs); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb9x-pci.h linux-2.6.33.3/arch/mips/ar71xx/dev-pb9x-pci.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb9x-pci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-pb9x-pci.h 2010-04-02 11:07:51.654953031 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-pb9x-pci.h linux-2.6.34/arch/mips/ar71xx/dev-pb9x-pci.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-pb9x-pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-pb9x-pci.h 2010-05-25 18:46:05.042263698 +0200 @@ -0,0 +1,22 @@ +/* + * Atheros PB9x reference board PCI initialization @@ -1784,9 +1785,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-pb9x-pci.h linux-2.6.33.3/arc +#endif + +#endif /* _AR71XX_DEV_PB9X_PCI_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-usb.c linux-2.6.33.3/arch/mips/ar71xx/dev-usb.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-usb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-usb.c 2010-04-02 11:07:51.694953375 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-usb.c linux-2.6.34/arch/mips/ar71xx/dev-usb.c +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-usb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-usb.c 2010-05-25 18:46:05.082223074 +0200 @@ -0,0 +1,181 @@ +/* + * Atheros AR71xx USB host device support @@ -1969,9 +1970,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-usb.c linux-2.6.33.3/arch/mip + BUG(); + } +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-usb.h linux-2.6.33.3/arch/mips/ar71xx/dev-usb.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/dev-usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/dev-usb.h 2010-01-05 20:38:52.326200390 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-usb.h linux-2.6.34/arch/mips/ar71xx/dev-usb.h +--- linux-2.6.34.orig/arch/mips/ar71xx/dev-usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/dev-usb.h 2010-05-25 18:46:05.123473207 +0200 @@ -0,0 +1,17 @@ +/* + * Atheros AR71xx USB host device support @@ -1990,9 +1991,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/dev-usb.h linux-2.6.33.3/arch/mip +void ar71xx_add_device_usb(void) __init; + +#endif /* _AR71XX_DEV_USB_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/early_printk.c linux-2.6.33.3/arch/mips/ar71xx/early_printk.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/early_printk.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/early_printk.c 2009-12-13 20:45:21.280039916 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/early_printk.c linux-2.6.34/arch/mips/ar71xx/early_printk.c +--- linux-2.6.34.orig/arch/mips/ar71xx/early_printk.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/early_printk.c 2010-05-25 18:46:05.161773008 +0200 @@ -0,0 +1,30 @@ +/* + * Atheros AR71xx SoC early printk support @@ -2024,9 +2025,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/early_printk.c linux-2.6.33.3/arc + while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0); +} + -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/gpio.c linux-2.6.33.3/arch/mips/ar71xx/gpio.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/gpio.c 2010-04-02 11:07:51.646954247 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/gpio.c linux-2.6.34/arch/mips/ar71xx/gpio.c +--- linux-2.6.34.orig/arch/mips/ar71xx/gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/gpio.c 2010-05-25 18:46:05.241889944 +0200 @@ -0,0 +1,182 @@ +/* + * Atheros AR71xx SoC GPIO API support @@ -2210,9 +2211,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/gpio.c linux-2.6.33.3/arch/mips/a + if (err) + panic("cannot add AR71xx GPIO chip, error=%d", err); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/irq.c linux-2.6.33.3/arch/mips/ar71xx/irq.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/irq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/irq.c 2010-05-16 13:17:31.871599360 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/irq.c linux-2.6.34/arch/mips/ar71xx/irq.c +--- linux-2.6.34.orig/arch/mips/ar71xx/irq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/irq.c 2010-05-25 18:46:05.283464015 +0200 @@ -0,0 +1,295 @@ +/* + * Atheros AR71xx SoC specific interrupt handling @@ -2509,9 +2510,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/irq.c linux-2.6.33.3/arch/mips/ar + + ar71xx_gpio_irq_init(); +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/Kconfig linux-2.6.33.3/arch/mips/ar71xx/Kconfig ---- linux-2.6.33.3.orig/arch/mips/ar71xx/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/Kconfig 2010-05-16 13:17:31.779600220 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/Kconfig linux-2.6.34/arch/mips/ar71xx/Kconfig +--- linux-2.6.34.orig/arch/mips/ar71xx/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/Kconfig 2010-05-25 18:46:05.333473006 +0200 @@ -0,0 +1,264 @@ +if ATHEROS_AR71XX + @@ -2777,9 +2778,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/Kconfig linux-2.6.33.3/arch/mips/ + def_bool n + +endif -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-ap81.c linux-2.6.33.3/arch/mips/ar71xx/mach-ap81.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-ap81.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-ap81.c 2010-03-23 20:31:04.604705903 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-ap81.c linux-2.6.34/arch/mips/ar71xx/mach-ap81.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-ap81.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-ap81.c 2010-05-25 18:46:05.373464152 +0200 @@ -0,0 +1,140 @@ +/* + * Atheros AP81 board support @@ -2921,9 +2922,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-ap81.c linux-2.6.33.3/arch/m +} + +MIPS_MACHINE(AR71XX_MACH_AP81, "AP81", "Atheros AP81", ap81_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-ap83.c linux-2.6.33.3/arch/mips/ar71xx/mach-ap83.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-ap83.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-ap83.c 2010-05-16 13:17:31.787602077 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-ap83.c linux-2.6.34/arch/mips/ar71xx/mach-ap83.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-ap83.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-ap83.c 2010-05-25 18:46:05.413464137 +0200 @@ -0,0 +1,266 @@ +/* + * Atheros AP83 board support @@ -3191,9 +3192,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-ap83.c linux-2.6.33.3/arch/m +} + +MIPS_MACHINE(AR71XX_MACH_AP83, "AP83", "Atheros AP83", ap83_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-aw-nr580.c linux-2.6.33.3/arch/mips/ar71xx/mach-aw-nr580.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-aw-nr580.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-aw-nr580.c 2010-05-16 13:17:33.024519409 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-aw-nr580.c linux-2.6.34/arch/mips/ar71xx/mach-aw-nr580.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-aw-nr580.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-aw-nr580.c 2010-05-25 18:46:05.443473125 +0200 @@ -0,0 +1,101 @@ +/* + * AzureWave AW-NR580 board support @@ -3296,9 +3297,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-aw-nr580.c linux-2.6.33.3/ar + +MIPS_MACHINE(AR71XX_MACH_AW_NR580, "AW-NR580", "AzureWave AW-NR580", + aw_nr580_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-dir-600-a1.c linux-2.6.33.3/arch/mips/ar71xx/mach-dir-600-a1.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-dir-600-a1.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-dir-600-a1.c 2010-05-16 13:17:31.839599757 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-dir-600-a1.c linux-2.6.34/arch/mips/ar71xx/mach-dir-600-a1.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-dir-600-a1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-dir-600-a1.c 2010-05-25 18:46:05.483473151 +0200 @@ -0,0 +1,138 @@ +/* + * D-Link DIR-600 rev. A1 board support @@ -3438,9 +3439,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-dir-600-a1.c linux-2.6.33.3/ + +MIPS_MACHINE(AR71XX_MACH_DIR_600_A1, "DIR-600-A1", "D-Link DIR-600 rev. A1", + dir_600_a1_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-dir-615-c1.c linux-2.6.33.3/arch/mips/ar71xx/mach-dir-615-c1.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-dir-615-c1.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-dir-615-c1.c 2010-05-16 13:17:31.775600829 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-dir-615-c1.c linux-2.6.34/arch/mips/ar71xx/mach-dir-615-c1.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-dir-615-c1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-dir-615-c1.c 2010-05-25 18:46:05.520978530 +0200 @@ -0,0 +1,173 @@ +/* + * D-Link DIR-615 rev C1 board support @@ -3615,9 +3616,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-dir-615-c1.c linux-2.6.33.3/ + +MIPS_MACHINE(AR71XX_MACH_DIR_615_C1, "DIR-615-C1", "D-Link DIR-615 rev. C1", + dir_615c1_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-dir-825-b1.c linux-2.6.33.3/arch/mips/ar71xx/mach-dir-825-b1.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-dir-825-b1.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-dir-825-b1.c 2010-05-16 13:17:32.715628389 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-dir-825-b1.c linux-2.6.34/arch/mips/ar71xx/mach-dir-825-b1.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-dir-825-b1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-dir-825-b1.c 2010-05-25 18:46:05.560978790 +0200 @@ -0,0 +1,192 @@ +/* + * D-Link DIR-825 rev. B1 board support @@ -3811,9 +3812,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-dir-825-b1.c linux-2.6.33.3/ + +MIPS_MACHINE(AR71XX_MACH_DIR_825_B1, "DIR-825-B1", "D-Link DIR-825 rev. B1", + dir825b1_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-mzk-w04nu.c linux-2.6.33.3/arch/mips/ar71xx/mach-mzk-w04nu.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-mzk-w04nu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-mzk-w04nu.c 2010-05-16 13:17:31.807598757 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-mzk-w04nu.c linux-2.6.34/arch/mips/ar71xx/mach-mzk-w04nu.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-mzk-w04nu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-mzk-w04nu.c 2010-05-25 18:46:05.603464127 +0200 @@ -0,0 +1,165 @@ +/* + * Planex MZK-W04NU board support @@ -3980,9 +3981,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-mzk-w04nu.c linux-2.6.33.3/a + +MIPS_MACHINE(AR71XX_MACH_MZK_W04NU, "MZK-W04NU", "Planex MZK-W04NU", + mzk_w04nu_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-mzk-w300nh.c linux-2.6.33.3/arch/mips/ar71xx/mach-mzk-w300nh.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-mzk-w300nh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-mzk-w300nh.c 2010-05-16 13:17:32.931648635 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-mzk-w300nh.c linux-2.6.34/arch/mips/ar71xx/mach-mzk-w300nh.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-mzk-w300nh.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-mzk-w300nh.c 2010-05-25 18:46:05.666212661 +0200 @@ -0,0 +1,158 @@ +/* + * Planex MZK-W300NH board support @@ -4142,9 +4143,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-mzk-w300nh.c linux-2.6.33.3/ + +MIPS_MACHINE(AR71XX_MACH_MZK_W300NH, "MZK-W300NH", "Planex MZK-W300NH", + mzk_w300nh_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-nbg460n.c linux-2.6.33.3/arch/mips/ar71xx/mach-nbg460n.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-nbg460n.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-nbg460n.c 2010-05-16 13:17:32.947611843 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-nbg460n.c linux-2.6.34/arch/mips/ar71xx/mach-nbg460n.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-nbg460n.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-nbg460n.c 2010-05-25 18:46:05.721448622 +0200 @@ -0,0 +1,222 @@ +/* + * Zyxel NBG 460N/550N/550NH board support @@ -4368,9 +4369,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-nbg460n.c linux-2.6.33.3/arc +} + +MIPS_MACHINE(AR71XX_MACH_NBG460N, "NBG460N", "Zyxel NBG460N/550N/550NH", nbg460n_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-pb42.c linux-2.6.33.3/arch/mips/ar71xx/mach-pb42.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-pb42.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-pb42.c 2010-03-23 20:31:05.092710513 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-pb42.c linux-2.6.34/arch/mips/ar71xx/mach-pb42.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-pb42.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-pb42.c 2010-05-25 18:46:05.763464059 +0200 @@ -0,0 +1,71 @@ +/* + * Atheros PB42 board support @@ -4443,9 +4444,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-pb42.c linux-2.6.33.3/arch/m +} + +MIPS_MACHINE(AR71XX_MACH_PB42, "PB42", "Atheros PB42", pb42_init); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-pb44.c linux-2.6.33.3/arch/mips/ar71xx/mach-pb44.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-pb44.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-pb44.c 2010-05-16 13:17:32.783600171 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-pb44.c linux-2.6.34/arch/mips/ar71xx/mach-pb44.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-pb44.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-pb44.c 2010-05-25 18:46:05.802223137 +0200 @@ -0,0 +1,207 @@ +/* + * Atheros PB44 board support @@ -4654,9 +4655,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-pb44.c linux-2.6.33.3/arch/m +} + +MIPS_MACHINE(AR71XX_MACH_PB44, "PB44", "Atheros PB44", pb44_init); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-pb92.c linux-2.6.33.3/arch/mips/ar71xx/mach-pb92.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-pb92.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-pb92.c 2010-04-14 21:17:12.138345698 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-pb92.c linux-2.6.34/arch/mips/ar71xx/mach-pb92.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-pb92.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-pb92.c 2010-05-25 18:46:05.830967287 +0200 @@ -0,0 +1,109 @@ +/* + * Atheros PB92 board support @@ -4767,9 +4768,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-pb92.c linux-2.6.33.3/arch/m +} + +MIPS_MACHINE(AR71XX_MACH_PB92, "PB92", "Atheros PB92", pb92_init); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-rb4xx.c linux-2.6.33.3/arch/mips/ar71xx/mach-rb4xx.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-rb4xx.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-rb4xx.c 2010-05-16 13:17:32.763620812 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-rb4xx.c linux-2.6.34/arch/mips/ar71xx/mach-rb4xx.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-rb4xx.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-rb4xx.c 2010-05-25 18:46:05.873464062 +0200 @@ -0,0 +1,290 @@ +/* + * MikroTik RouterBOARD 4xx series support @@ -5061,9 +5062,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-rb4xx.c linux-2.6.33.3/arch/ + +MIPS_MACHINE(AR71XX_MACH_RB_493, "493", "MikroTik RouterBOARD 493/AH", + rb493_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-rb750.c linux-2.6.33.3/arch/mips/ar71xx/mach-rb750.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-rb750.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-rb750.c 2010-03-12 19:31:46.886045750 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-rb750.c linux-2.6.34/arch/mips/ar71xx/mach-rb750.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-rb750.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-rb750.c 2010-05-25 18:46:05.912223101 +0200 @@ -0,0 +1,133 @@ +/* + * MikroTik RouterBOARD 750 support @@ -5198,9 +5199,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-rb750.c linux-2.6.33.3/arch/ + +MIPS_MACHINE(AR71XX_MACH_RB_750, "750i", "MikroTik RouterBOARD 750", + rb750_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tew-632brp.c linux-2.6.33.3/arch/mips/ar71xx/mach-tew-632brp.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tew-632brp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-tew-632brp.c 2010-05-16 13:17:32.899597622 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tew-632brp.c linux-2.6.34/arch/mips/ar71xx/mach-tew-632brp.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-tew-632brp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-tew-632brp.c 2010-05-25 18:46:05.952223131 +0200 @@ -0,0 +1,149 @@ +/* + * TrendNET TEW-632BRP board support @@ -5351,9 +5352,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tew-632brp.c linux-2.6.33.3/ + +MIPS_MACHINE(AR71XX_MACH_TEW_632BRP, "TEW-632BRP", "TRENDnet TEW-632BRP", + tew_632brp_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c linux-2.6.33.3/arch/mips/ar71xx/mach-tl-wr1043nd.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-tl-wr1043nd.c 2010-05-16 13:17:31.779600220 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c linux-2.6.34/arch/mips/ar71xx/mach-tl-wr1043nd.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-tl-wr1043nd.c 2010-05-25 18:46:05.990964132 +0200 @@ -0,0 +1,156 @@ +/* + * TP-LINK TL-WR1043ND board support @@ -5511,9 +5512,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c linux-2.6.33.3 + +MIPS_MACHINE(AR71XX_MACH_TL_WR1043ND, "TL-WR1043ND", "TP-LINK TL-WR1043ND", + tl_wr1043nd_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr741nd.c linux-2.6.33.3/arch/mips/ar71xx/mach-tl-wr741nd.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr741nd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-tl-wr741nd.c 2010-05-16 13:17:33.043600332 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr741nd.c linux-2.6.34/arch/mips/ar71xx/mach-tl-wr741nd.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr741nd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-tl-wr741nd.c 2010-05-25 18:46:06.033464057 +0200 @@ -0,0 +1,115 @@ +/* + * TP-LINK TL-WR741ND board support @@ -5630,9 +5631,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr741nd.c linux-2.6.33.3/ +} +MIPS_MACHINE(AR71XX_MACH_TL_WR741ND, "TL-WR741ND", "TP-LINK TL-WR741ND", + tl_wr741nd_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr841n.c linux-2.6.33.3/arch/mips/ar71xx/mach-tl-wr841n.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr841n.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-tl-wr841n.c 2010-05-16 13:17:32.951604530 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr841n.c linux-2.6.34/arch/mips/ar71xx/mach-tl-wr841n.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr841n.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-tl-wr841n.c 2010-05-25 18:46:06.091873727 +0200 @@ -0,0 +1,143 @@ +/* + * TP-LINK TL-WR841N board support @@ -5777,9 +5778,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr841n.c linux-2.6.33.3/a + +MIPS_MACHINE(AR71XX_MACH_TL_WR841N_V1, "TL-WR841N-v1.5", "TP-LINK TL-WR841N v1", + tl_wr841n_v1_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr941nd.c linux-2.6.33.3/arch/mips/ar71xx/mach-tl-wr941nd.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr941nd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-tl-wr941nd.c 2010-05-16 13:17:33.088566117 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr941nd.c linux-2.6.34/arch/mips/ar71xx/mach-tl-wr941nd.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr941nd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-tl-wr941nd.c 2010-05-25 18:46:06.132223001 +0200 @@ -0,0 +1,142 @@ +/* + * TP-LINK TL-WR941ND board support @@ -5923,9 +5924,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-tl-wr941nd.c linux-2.6.33.3/ + +MIPS_MACHINE(AR71XX_MACH_TL_WR941ND, "TL-WR941ND", "TP-LINK TL-WR941ND", + tl_wr941nd_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/machtype.h linux-2.6.33.3/arch/mips/ar71xx/machtype.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/machtype.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/machtype.h 2010-05-16 13:17:32.799599694 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/machtype.h linux-2.6.34/arch/mips/ar71xx/machtype.h +--- linux-2.6.34.orig/arch/mips/ar71xx/machtype.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/machtype.h 2010-05-25 18:46:06.170978587 +0200 @@ -0,0 +1,60 @@ +/* + * Atheros AR71xx machine type definitions @@ -5987,9 +5988,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/machtype.h linux-2.6.33.3/arch/mi +}; + +#endif /* _AR71XX_MACHTYPE_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-ubnt.c linux-2.6.33.3/arch/mips/ar71xx/mach-ubnt.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-ubnt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-ubnt.c 2010-05-16 13:17:31.783601847 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-ubnt.c linux-2.6.34/arch/mips/ar71xx/mach-ubnt.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-ubnt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-ubnt.c 2010-05-25 18:46:06.210978842 +0200 @@ -0,0 +1,281 @@ +/* + * Ubiquiti RouterStation support @@ -6272,9 +6273,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-ubnt.c linux-2.6.33.3/arch/m + +MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M", + ubnt_nano_m_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wndr3700.c linux-2.6.33.3/arch/mips/ar71xx/mach-wndr3700.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wndr3700.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-wndr3700.c 2010-05-16 13:17:33.059599577 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wndr3700.c linux-2.6.34/arch/mips/ar71xx/mach-wndr3700.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-wndr3700.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-wndr3700.c 2010-05-25 18:46:06.250979126 +0200 @@ -0,0 +1,209 @@ +/* + * Netgear WNDR3700 board support @@ -6485,9 +6486,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wndr3700.c linux-2.6.33.3/ar + +MIPS_MACHINE(AR71XX_MACH_WNDR3700, "WNDR3700", "NETGEAR WNDR3700", + wndr3700_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wnr2000.c linux-2.6.33.3/arch/mips/ar71xx/mach-wnr2000.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wnr2000.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-wnr2000.c 2010-05-16 13:17:31.783601847 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wnr2000.c linux-2.6.34/arch/mips/ar71xx/mach-wnr2000.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-wnr2000.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-wnr2000.c 2010-05-25 18:46:06.290978653 +0200 @@ -0,0 +1,148 @@ +/* + * NETGEAR WNR2000 board support @@ -6637,9 +6638,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wnr2000.c linux-2.6.33.3/arc +} + +MIPS_MACHINE(AR71XX_MACH_WNR2000, "WNR2000", "NETGEAR WNR2000", wnr2000_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wp543.c linux-2.6.33.3/arch/mips/ar71xx/mach-wp543.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wp543.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-wp543.c 2010-03-23 20:31:05.506280502 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wp543.c linux-2.6.34/arch/mips/ar71xx/mach-wp543.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-wp543.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-wp543.c 2010-05-25 18:46:06.340979863 +0200 @@ -0,0 +1,99 @@ +/* + * Compex WP543/WPJ543 board support @@ -6740,9 +6741,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wp543.c linux-2.6.33.3/arch/ +} + +MIPS_MACHINE(AR71XX_MACH_WP543, "WP543", "Compex WP543", wp543_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wrt160nl.c linux-2.6.33.3/arch/mips/ar71xx/mach-wrt160nl.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wrt160nl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-wrt160nl.c 2010-05-16 13:17:32.731626515 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wrt160nl.c linux-2.6.34/arch/mips/ar71xx/mach-wrt160nl.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-wrt160nl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-wrt160nl.c 2010-05-25 18:46:06.390978782 +0200 @@ -0,0 +1,158 @@ +/* + * Linksys WRT160NL board support @@ -6902,9 +6903,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wrt160nl.c linux-2.6.33.3/ar + +MIPS_MACHINE(AR71XX_MACH_WRT160NL, "WRT160NL", "Linksys WRT160NL", + wrt160nl_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wrt400n.c linux-2.6.33.3/arch/mips/ar71xx/mach-wrt400n.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wrt400n.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-wrt400n.c 2010-05-16 13:17:31.823599676 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wrt400n.c linux-2.6.34/arch/mips/ar71xx/mach-wrt400n.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-wrt400n.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-wrt400n.c 2010-05-25 18:46:06.432223100 +0200 @@ -0,0 +1,168 @@ +/* + * Linksys WRT400N board support @@ -7074,9 +7075,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wrt400n.c linux-2.6.33.3/arc +} + +MIPS_MACHINE(AR71XX_MACH_WRT400N, "WRT400N", "Linksys WRT400N", wrt400n_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c linux-2.6.33.3/arch/mips/ar71xx/mach-wzr-hp-g300nh.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 2010-05-16 13:17:31.855600117 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c linux-2.6.34/arch/mips/ar71xx/mach-wzr-hp-g300nh.c +--- linux-2.6.34.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 2010-05-25 18:46:06.480978988 +0200 @@ -0,0 +1,265 @@ +/* + * Buffalo WZR-HP-G300NH board support @@ -7343,9 +7344,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c linux-2.6.33 + +MIPS_MACHINE(AR71XX_MACH_WZR_HP_G300NH, "WZR-HP-G300NH", + "Buffalo WZR-HP-G300NH", wzrhpg300nh_setup); -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/Makefile linux-2.6.33.3/arch/mips/ar71xx/Makefile ---- linux-2.6.33.3.orig/arch/mips/ar71xx/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/Makefile 2010-05-17 21:19:51.539114190 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/Makefile linux-2.6.34/arch/mips/ar71xx/Makefile +--- linux-2.6.34.orig/arch/mips/ar71xx/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/Makefile 2010-05-25 18:46:06.523464007 +0200 @@ -0,0 +1,54 @@ +# +# Makefile for the Atheros AR71xx SoC specific parts of the kernel @@ -7401,9 +7402,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/Makefile linux-2.6.33.3/arch/mips +obj-$(CONFIG_AR71XX_MACH_WP543) += mach-wp543.o +obj-$(CONFIG_AR71XX_MACH_WRT160NL) += mach-wrt160nl.o +obj-$(CONFIG_AR71XX_MACH_WRT400N) += mach-wrt400n.o -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/nvram.c linux-2.6.33.3/arch/mips/ar71xx/nvram.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/nvram.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/nvram.c 2010-01-05 20:38:52.061278082 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/nvram.c linux-2.6.34/arch/mips/ar71xx/nvram.c +--- linux-2.6.34.orig/arch/mips/ar71xx/nvram.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/nvram.c 2010-05-25 18:46:06.563464058 +0200 @@ -0,0 +1,75 @@ +/* + * Atheros AR71xx minimal nvram support @@ -7480,9 +7481,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/nvram.c linux-2.6.33.3/arch/mips/ + vfree(buf); + return ret; +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/nvram.h linux-2.6.33.3/arch/mips/ar71xx/nvram.h ---- linux-2.6.33.3.orig/arch/mips/ar71xx/nvram.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/nvram.h 2010-01-05 20:38:52.137278273 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/nvram.h linux-2.6.34/arch/mips/ar71xx/nvram.h +--- linux-2.6.34.orig/arch/mips/ar71xx/nvram.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/nvram.h 2010-05-25 18:46:06.602223088 +0200 @@ -0,0 +1,19 @@ +/* + * Atheros AR71xx minimal nvram support @@ -7503,9 +7504,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/nvram.h linux-2.6.33.3/arch/mips/ + const char *name, char *mac) __init; + +#endif /* _AR71XX_NVRAM_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/pci.c linux-2.6.33.3/arch/mips/ar71xx/pci.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/pci.c 2010-04-02 11:07:51.847025813 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/pci.c linux-2.6.34/arch/mips/ar71xx/pci.c +--- linux-2.6.34.orig/arch/mips/ar71xx/pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/pci.c 2010-05-25 18:46:06.641506945 +0200 @@ -0,0 +1,93 @@ +/* + * Atheros AR71xx PCI setup code @@ -7600,9 +7601,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/pci.c linux-2.6.33.3/arch/mips/ar + + return ret; +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/prom.c linux-2.6.33.3/arch/mips/ar71xx/prom.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/prom.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/prom.c 2010-05-20 17:47:32.151849828 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/prom.c linux-2.6.34/arch/mips/ar71xx/prom.c +--- linux-2.6.34.orig/arch/mips/ar71xx/prom.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/prom.c 2010-05-25 18:46:06.682223087 +0200 @@ -0,0 +1,105 @@ +/* + * Atheros AR71xx SoC specific prom routines @@ -7709,9 +7710,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/prom.c linux-2.6.33.3/arch/mips/a +{ + /* We do not have to prom memory to free */ +} -diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/setup.c linux-2.6.33.3/arch/mips/ar71xx/setup.c ---- linux-2.6.33.3.orig/arch/mips/ar71xx/setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/ar71xx/setup.c 2010-04-02 11:07:51.650955594 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/setup.c linux-2.6.34/arch/mips/ar71xx/setup.c +--- linux-2.6.34.orig/arch/mips/ar71xx/setup.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/ar71xx/setup.c 2010-05-25 18:46:06.747917885 +0200 @@ -0,0 +1,310 @@ +/* + * Atheros AR71xx SoC specific setup @@ -8023,9 +8024,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/ar71xx/setup.c linux-2.6.33.3/arch/mips/ + +MIPS_MACHINE(AR71XX_MACH_GENERIC, "Generic", "Generic AR71xx board", + ar71xx_generic_init); -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/ar71xx.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/ar71xx.h 2010-04-02 11:07:50.806953666 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/ar71xx.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/ar71xx.h 2010-05-25 18:46:06.783464047 +0200 @@ -0,0 +1,514 @@ +/* + * Atheros AR71xx SoC specific definitions @@ -8541,9 +8542,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h linux-2 +#endif /* __ASSEMBLER__ */ + +#endif /* __ASM_MACH_AR71XX_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 2009-12-13 20:45:20.439922318 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 2010-05-25 18:46:06.842223171 +0200 @@ -0,0 +1,26 @@ +/* + * AR91xx parallel flash driver platform data definitions @@ -8571,9 +8572,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h l +}; + +#endif /* __AR91XX_FLASH_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 2009-12-13 20:45:20.471921431 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 2010-05-25 18:46:06.883464235 +0200 @@ -0,0 +1,56 @@ +/* + * Atheros AR71xx specific CPU feature overrides @@ -8631,9 +8632,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-over +#define cpu_icache_line_size() 32 + +#endif /* __ASM_MACH_AR71XX_CPU_FEATURE_OVERRIDES_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/gpio.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/gpio.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/gpio.h 2009-12-13 20:45:20.471921431 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/gpio.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/gpio.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/gpio.h 2010-05-25 18:46:06.922223109 +0200 @@ -0,0 +1,53 @@ +/* + * Atheros AR71xx GPIO API definitions @@ -8688,9 +8689,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/gpio.h linux-2.6 +#define gpio_cansleep __gpio_cansleep + +#endif /* __ASM_MACH_AR71XX_GPIO_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/irq.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/irq.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/irq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/irq.h 2009-12-13 20:45:20.447923983 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/irq.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/irq.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/irq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/irq.h 2010-05-25 18:46:06.961120355 +0200 @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2008-2009 Gabor Juhos @@ -8709,9 +8710,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/irq.h linux-2.6. +#include_next + +#endif /* __ASM_MACH_AR71XX_IRQ_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 2009-12-13 20:45:20.611920954 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 2010-05-25 18:46:07.003473055 +0200 @@ -0,0 +1,32 @@ +/* + * Atheros AR71xx specific kernel entry setup @@ -8745,9 +8746,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-ini + .endm + +#endif /* __ASM_MACH_AR71XX_KERNEL_ENTRY_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/mach-rb750.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 2010-03-12 19:31:45.750044904 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/mach-rb750.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 2010-05-25 18:46:07.040970889 +0200 @@ -0,0 +1,66 @@ +/* + * MikroTik RouterBOARD 750 definitions @@ -8816,9 +8817,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h lin + +#endif /* _MACH_RB750_H */ \ No newline at end of file -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/mangle-port.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/mangle-port.h 2009-12-13 20:45:20.615923464 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/mangle-port.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/mangle-port.h 2010-05-25 18:46:07.080975596 +0200 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2008 Gabor Juhos @@ -8865,9 +8866,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h li +#endif + +#endif /* __ASM_MACH_AR71XX_MANGLE_PORT_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/pci.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/pci.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/pci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/pci.h 2009-12-13 20:45:20.471921431 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/pci.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/pci.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/pci.h 2010-05-25 18:46:07.122223041 +0200 @@ -0,0 +1,39 @@ +/* + * Atheros AR71xx SoC specific PCI definitions @@ -8908,9 +8909,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/pci.h linux-2.6. +int ar71xx_pci_init(unsigned nr_irqs, struct ar71xx_pci_irq *map) __init; + +#endif /* __ASM_MACH_AR71XX_PCI_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/platform.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/platform.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/platform.h 2009-12-13 20:45:20.611920954 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/platform.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/platform.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/platform.h 2010-05-25 18:46:07.171468638 +0200 @@ -0,0 +1,61 @@ +/* + * Atheros AR71xx SoC specific platform data definitions @@ -8973,9 +8974,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/platform.h linux +#define AR71XX_SPI_CS_ACTIVE 1 + +#endif /* __ASM_MACH_AR71XX_PLATFORM_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/war.h linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/war.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/war.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mach-ar71xx/war.h 2009-12-13 20:45:20.443925666 +0100 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/war.h linux-2.6.34/arch/mips/include/asm/mach-ar71xx/war.h +--- linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/war.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mach-ar71xx/war.h 2010-05-25 18:46:07.220978398 +0200 @@ -0,0 +1,25 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -9002,9 +9003,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mach-ar71xx/war.h linux-2.6. +#define MIPS34K_MISSED_ITLB_WAR 0 + +#endif /* __ASM_MACH_AR71XX_WAR_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mips_machine.h linux-2.6.33.3/arch/mips/include/asm/mips_machine.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/mips_machine.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33.3/arch/mips/include/asm/mips_machine.h 2010-05-17 19:36:16.051124934 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mips_machine.h linux-2.6.34/arch/mips/include/asm/mips_machine.h +--- linux-2.6.34.orig/arch/mips/include/asm/mips_machine.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/arch/mips/include/asm/mips_machine.h 2010-05-25 18:46:07.270971848 +0200 @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2008-2009 Gabor Juhos @@ -9060,9 +9061,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/mips_machine.h linux-2.6.33. +pure_initcall(register_machine_##_type) + +#endif /* __ASM_MIPS_MACHINE_H */ -diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/time.h linux-2.6.33.3/arch/mips/include/asm/time.h ---- linux-2.6.33.3.orig/arch/mips/include/asm/time.h 2010-04-26 16:48:30.000000000 +0200 -+++ linux-2.6.33.3/arch/mips/include/asm/time.h 2010-05-18 19:33:35.811338021 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/include/asm/time.h linux-2.6.34/arch/mips/include/asm/time.h +--- linux-2.6.34.orig/arch/mips/include/asm/time.h 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/mips/include/asm/time.h 2010-05-25 18:46:07.320975755 +0200 @@ -52,6 +52,7 @@ */ #ifdef CONFIG_CEVT_R4K_LIB @@ -9071,9 +9072,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/include/asm/time.h linux-2.6.33.3/arch/m extern int r4k_clockevent_init(void); #endif -diff -Nur linux-2.6.33.3.orig/arch/mips/Kconfig linux-2.6.33.3/arch/mips/Kconfig ---- linux-2.6.33.3.orig/arch/mips/Kconfig 2010-04-26 16:48:30.000000000 +0200 -+++ linux-2.6.33.3/arch/mips/Kconfig 2010-05-20 16:39:56.083849540 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/Kconfig linux-2.6.34/arch/mips/Kconfig +--- linux-2.6.34.orig/arch/mips/Kconfig 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/mips/Kconfig 2010-05-25 18:46:07.382337624 +0200 @@ -48,6 +48,23 @@ Support for the Texas Instruments AR7 System-on-a-Chip family: TNETD7100, 7200 and 7300. @@ -9096,9 +9097,9 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/Kconfig linux-2.6.33.3/arch/mips/Kconfig + Support for Atheros AR71xx based boards. + config BCM47XX - bool "BCM47XX based boards" + bool "Broadcom BCM47XX based boards" select CEVT_R4K -@@ -682,6 +699,7 @@ +@@ -684,6 +701,7 @@ endchoice source "arch/mips/alchemy/Kconfig" @@ -9106,7 +9107,7 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/Kconfig linux-2.6.33.3/arch/mips/Kconfig source "arch/mips/bcm63xx/Kconfig" source "arch/mips/jazz/Kconfig" source "arch/mips/lasat/Kconfig" -@@ -848,9 +866,15 @@ +@@ -850,9 +868,15 @@ config MIPS_DISABLE_OBSOLETE_IDE bool @@ -9122,21 +9123,21 @@ diff -Nur linux-2.6.33.3.orig/arch/mips/Kconfig linux-2.6.33.3/arch/mips/Kconfig config NO_IOPORT def_bool n -diff -Nur linux-2.6.33.3.orig/arch/mips/kernel/Makefile linux-2.6.33.3/arch/mips/kernel/Makefile ---- linux-2.6.33.3.orig/arch/mips/kernel/Makefile 2010-04-26 16:48:30.000000000 +0200 -+++ linux-2.6.33.3/arch/mips/kernel/Makefile 2010-05-17 18:51:38.331117283 +0200 +diff -Nur linux-2.6.34.orig/arch/mips/kernel/Makefile linux-2.6.34/arch/mips/kernel/Makefile +--- linux-2.6.34.orig/arch/mips/kernel/Makefile 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/arch/mips/kernel/Makefile 2010-05-25 19:00:48.342223057 +0200 @@ -93,6 +93,7 @@ obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +obj-$(CONFIG_MIPS_MACHINE) += mips_machine.o + obj-$(