diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /target/rb4xx/patches | |
parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'target/rb4xx/patches')
-rw-r--r-- | target/rb4xx/patches/ar71xx.patch | 16431 |
1 files changed, 15992 insertions, 439 deletions
diff --git a/target/rb4xx/patches/ar71xx.patch b/target/rb4xx/patches/ar71xx.patch index 477c9e611..697379d36 100644 --- a/target/rb4xx/patches/ar71xx.patch +++ b/target/rb4xx/patches/ar71xx.patch @@ -1,6 +1,6 @@ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.35.7/arch/mips/ar71xx/ar71xx.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/ar71xx.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/ar71xx.c 2010-10-14 20:27:55.855601218 +0200 @@ -0,0 +1,177 @@ +/* + * AR71xx SoC routines @@ -179,9 +179,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.34/arch/mips/ar7 + mutex_unlock(&ar71xx_flash_mutex); +} +EXPORT_SYMBOL_GPL(ar71xx_flash_release); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.c linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-eth.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-eth.c 2010-10-14 20:27:55.876851074 +0200 @@ -0,0 +1,70 @@ +/* + * Atheros AP91 reference board ethernet initialization @@ -253,9 +253,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-eth.c linux-2.6.34/arch/mi + + ar71xx_add_device_dsa(1, &ap91_dsa_data); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.h linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-eth.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-eth.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-eth.h 2010-10-14 20:27:55.918101097 +0200 @@ -0,0 +1,23 @@ +/* + * Atheros AP91 reference board ethernet initialization @@ -280,9 +280,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-eth.h linux-2.6.34/arch/mi + +#endif /* _AR71XX_DEV_AP91_ETH_H */ + -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-pci.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-pci.c 2010-10-14 20:27:55.964356595 +0200 @@ -0,0 +1,114 @@ +/* + * Atheros AP91 reference board PCI initialization @@ -398,9 +398,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.34/arch/mi + + ap91_pci_fixup_enabled = 1; +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-pci.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap91-pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap91-pci.h 2010-10-14 20:27:56.005601094 +0200 @@ -0,0 +1,21 @@ +/* + * Atheros AP91 reference board PCI initialization @@ -423,9 +423,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.34/arch/mi + +#endif /* _AR71XX_DEV_AP91_PCI_H */ + -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.35.7/arch/mips/ar71xx/dev-ap94-pci.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap94-pci.c 2010-10-14 20:27:56.056135764 +0200 @@ -0,0 +1,159 @@ +/* + * Atheros AP94 reference board PCI initialization @@ -586,9 +586,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.34/arch/mi + + ap94_pci_fixup_enabled = 1; +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.35.7/arch/mips/ar71xx/dev-ap94-pci.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ap94-pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-ap94-pci.h 2010-10-14 20:27:56.105939718 +0200 @@ -0,0 +1,28 @@ +/* + * Atheros AP94 reference board PCI initialization @@ -618,9 +618,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.34/arch/mi + +#endif /* _AR71XX_DEV_AP94_PCI_H */ + -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.35.7/arch/mips/ar71xx/dev-ar913x-wmac.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-ar913x-wmac.c 2010-10-14 20:27:56.154378236 +0200 @@ -0,0 +1,68 @@ +/* + * Atheros AR913x SoC built-in WMAC device support @@ -690,9 +690,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.34/arch + + platform_device_register(&ar913x_wmac_device); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.h linux-2.6.35.7/arch/mips/ar71xx/dev-ar913x-wmac.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-ar913x-wmac.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-ar913x-wmac.h 2010-10-14 20:27:56.205590855 +0200 @@ -0,0 +1,19 @@ +/* + * Atheros AR913x SoC built-in WMAC device support @@ -713,9 +713,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-ar913x-wmac.h linux-2.6.34/arch +void ar913x_add_device_wmac(u8 *cal_data, u8 *mac_addr) __init; + +#endif /* _AR71XX_DEV_AR913X_WMAC_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.c linux-2.6.35.7/arch/mips/ar71xx/dev-dsa.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-dsa.c 2010-10-14 20:27:56.255387205 +0200 @@ -0,0 +1,50 @@ +/* + * Atheros AR71xx DSA switch device support @@ -767,9 +767,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-dsa.c linux-2.6.34/arch/mips/ar + + platform_device_register(&ar71xx_dsa_switch_device); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.h linux-2.6.35.7/arch/mips/ar71xx/dev-dsa.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-dsa.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-dsa.h 2010-10-14 20:27:56.305200658 +0200 @@ -0,0 +1,20 @@ +/* + * Atheros AR71xx DSA switch device support @@ -791,9 +791,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-dsa.h linux-2.6.34/arch/mips/ar + struct dsa_platform_data *d) __init; + +#endif /* _AR71XX_DEV_DSA_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.c linux-2.6.35.7/arch/mips/ar71xx/dev-gpio-buttons.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-gpio-buttons.c 2010-10-14 20:27:56.355043092 +0200 @@ -0,0 +1,58 @@ +/* + * Atheros AR71xx GPIO button support @@ -853,9 +853,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-gpio-buttons.c linux-2.6.34/arc +err_free_buttons: + kfree(p); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.h linux-2.6.35.7/arch/mips/ar71xx/dev-gpio-buttons.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-gpio-buttons.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-gpio-buttons.h 2010-10-14 20:27:56.404843567 +0200 @@ -0,0 +1,25 @@ +/* + * Atheros AR71xx GPIO button support @@ -882,9 +882,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-gpio-buttons.h linux-2.6.34/arc + struct gpio_button *buttons) __init; + +#endif /* _AR71XX_DEV_GPIO_BUTTONS_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/devices.c linux-2.6.35.7/arch/mips/ar71xx/devices.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/devices.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/devices.c 2010-10-14 20:27:56.454649960 +0200 @@ -0,0 +1,575 @@ +/* + * Atheros AR71xx SoC platform devices @@ -1461,9 +1461,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/devices.c linux-2.6.34/arch/mips/ar + return 1; +} +__setup("kmac=", ar71xx_kmac_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/devices.h linux-2.6.35.7/arch/mips/ar71xx/devices.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/devices.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/devices.h 2010-10-14 20:27:56.504463432 +0200 @@ -0,0 +1,48 @@ +/* + * Atheros AR71xx SoC device definitions @@ -1513,9 +1513,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/devices.h linux-2.6.34/arch/mips/ar +void ar71xx_add_device_wdt(void) __init; + +#endif /* __AR71XX_DEVICES_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-leds-gpio.c linux-2.6.35.7/arch/mips/ar71xx/dev-leds-gpio.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-leds-gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-leds-gpio.c 2010-10-14 20:27:56.545601257 +0200 @@ -0,0 +1,57 @@ +/* + * Atheros AR71xx GPIO LED device support @@ -1574,9 +1574,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-leds-gpio.c linux-2.6.34/arch/m +err_free_leds: + kfree(p); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-leds-gpio.h linux-2.6.35.7/arch/mips/ar71xx/dev-leds-gpio.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-leds-gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-leds-gpio.h 2010-10-14 20:27:56.595814317 +0200 @@ -0,0 +1,21 @@ +/* + * Atheros AR71xx GPIO LED device support @@ -1599,9 +1599,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-leds-gpio.h linux-2.6.34/arch/m + struct gpio_led *leds) __init; + +#endif /* _AR71XX_DEV_LEDS_GPIO_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-m25p80.c linux-2.6.35.7/arch/mips/ar71xx/dev-m25p80.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-m25p80.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-m25p80.c 2010-10-14 20:27:56.645623230 +0200 @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org> @@ -1633,9 +1633,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-m25p80.c linux-2.6.34/arch/mips + ar71xx_add_device_spi(NULL, ar71xx_spi_info, + ARRAY_SIZE(ar71xx_spi_info)); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-m25p80.h linux-2.6.35.7/arch/mips/ar71xx/dev-m25p80.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-m25p80.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-m25p80.h 2010-10-14 20:27:56.695412366 +0200 @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org> @@ -1653,9 +1653,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-m25p80.h linux-2.6.34/arch/mips +void ar71xx_add_device_m25p80(struct flash_platform_data *pdata) __init; + +#endif /* _AR71XX_DEV_M25P80_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb42-pci.c linux-2.6.35.7/arch/mips/ar71xx/dev-pb42-pci.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb42-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-pb42-pci.c 2010-10-14 20:27:56.745266514 +0200 @@ -0,0 +1,40 @@ +/* + * Atheros PB42 reference board PCI initialization @@ -1697,9 +1697,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-pb42-pci.c linux-2.6.34/arch/mi +{ + ar71xx_pci_init(ARRAY_SIZE(pb42_pci_irqs), pb42_pci_irqs); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb42-pci.h linux-2.6.35.7/arch/mips/ar71xx/dev-pb42-pci.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb42-pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-pb42-pci.h 2010-10-14 20:27:56.795082429 +0200 @@ -0,0 +1,21 @@ +/* + * Atheros PB42 reference board PCI initialization @@ -1722,9 +1722,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-pb42-pci.h linux-2.6.34/arch/mi +#endif + +#endif /* _AR71XX_DEV_PB42_PCI_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb9x-pci.c linux-2.6.35.7/arch/mips/ar71xx/dev-pb9x-pci.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb9x-pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-pb9x-pci.c 2010-10-14 20:27:56.844918541 +0200 @@ -0,0 +1,33 @@ +/* + * Atheros PB9x reference board PCI initialization @@ -1759,9 +1759,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-pb9x-pci.c linux-2.6.34/arch/mi +{ + ar71xx_pci_init(ARRAY_SIZE(pb9x_pci_irqs), pb9x_pci_irqs); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb9x-pci.h linux-2.6.35.7/arch/mips/ar71xx/dev-pb9x-pci.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-pb9x-pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-pb9x-pci.h 2010-10-14 20:27:56.894720777 +0200 @@ -0,0 +1,22 @@ +/* + * Atheros PB9x reference board PCI initialization @@ -1785,9 +1785,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-pb9x-pci.h linux-2.6.34/arch/mi +#endif + +#endif /* _AR71XX_DEV_PB9X_PCI_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-usb.c linux-2.6.35.7/arch/mips/ar71xx/dev-usb.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-usb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-usb.c 2010-10-14 20:27:56.944533864 +0200 @@ -0,0 +1,181 @@ +/* + * Atheros AR71xx USB host device support @@ -1970,9 +1970,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-usb.c linux-2.6.34/arch/mips/ar + BUG(); + } +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/dev-usb.h linux-2.6.35.7/arch/mips/ar71xx/dev-usb.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/dev-usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/dev-usb.h 2010-10-14 20:27:56.994353425 +0200 @@ -0,0 +1,17 @@ +/* + * Atheros AR71xx USB host device support @@ -1991,9 +1991,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/dev-usb.h linux-2.6.34/arch/mips/ar +void ar71xx_add_device_usb(void) __init; + +#endif /* _AR71XX_DEV_USB_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/early_printk.c linux-2.6.35.7/arch/mips/ar71xx/early_printk.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/early_printk.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/early_printk.c 2010-10-14 20:27:57.044356938 +0200 @@ -0,0 +1,30 @@ +/* + * Atheros AR71xx SoC early printk support @@ -2025,9 +2025,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/early_printk.c linux-2.6.34/arch/mi + while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0); +} + -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/gpio.c linux-2.6.35.7/arch/mips/ar71xx/gpio.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/gpio.c 2010-10-14 20:27:57.084356695 +0200 @@ -0,0 +1,182 @@ +/* + * Atheros AR71xx SoC GPIO API support @@ -2211,9 +2211,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/gpio.c linux-2.6.34/arch/mips/ar71x + if (err) + panic("cannot add AR71xx GPIO chip, error=%d", err); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/irq.c linux-2.6.35.7/arch/mips/ar71xx/irq.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/irq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/irq.c 2010-10-14 20:27:57.135484452 +0200 @@ -0,0 +1,295 @@ +/* + * Atheros AR71xx SoC specific interrupt handling @@ -2510,9 +2510,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/irq.c linux-2.6.34/arch/mips/ar71xx + + ar71xx_gpio_irq_init(); +} -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/Kconfig linux-2.6.35.7/arch/mips/ar71xx/Kconfig +--- linux-2.6.35.7.orig/arch/mips/ar71xx/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/Kconfig 2010-10-14 20:27:57.185337757 +0200 @@ -0,0 +1,264 @@ +if ATHEROS_AR71XX + @@ -2778,9 +2778,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/Kconfig linux-2.6.34/arch/mips/ar71 + def_bool n + +endif -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap81.c linux-2.6.35.7/arch/mips/ar71xx/mach-ap81.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap81.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-ap81.c 2010-10-14 20:27:57.235141599 +0200 @@ -0,0 +1,140 @@ +/* + * Atheros AP81 board support @@ -2922,9 +2922,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-ap81.c linux-2.6.34/arch/mips/ +} + +MIPS_MACHINE(AR71XX_MACH_AP81, "AP81", "Atheros AP81", ap81_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap83.c linux-2.6.35.7/arch/mips/ar71xx/mach-ap83.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ap83.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-ap83.c 2010-10-14 20:27:57.284350521 +0200 @@ -0,0 +1,266 @@ +/* + * Atheros AP83 board support @@ -3192,9 +3192,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-ap83.c linux-2.6.34/arch/mips/ +} + +MIPS_MACHINE(AR71XX_MACH_AP83, "AP83", "Atheros AP83", ap83_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-aw-nr580.c linux-2.6.35.7/arch/mips/ar71xx/mach-aw-nr580.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-aw-nr580.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-aw-nr580.c 2010-10-14 20:27:57.334787684 +0200 @@ -0,0 +1,101 @@ +/* + * AzureWave AW-NR580 board support @@ -3297,9 +3297,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-aw-nr580.c linux-2.6.34/arch/m + +MIPS_MACHINE(AR71XX_MACH_AW_NR580, "AW-NR580", "AzureWave AW-NR580", + aw_nr580_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-600-a1.c linux-2.6.35.7/arch/mips/ar71xx/mach-dir-600-a1.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-600-a1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-dir-600-a1.c 2010-10-14 20:27:57.384602615 +0200 @@ -0,0 +1,138 @@ +/* + * D-Link DIR-600 rev. A1 board support @@ -3439,9 +3439,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-dir-600-a1.c linux-2.6.34/arch + +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.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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-615-c1.c linux-2.6.35.7/arch/mips/ar71xx/mach-dir-615-c1.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-615-c1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-dir-615-c1.c 2010-10-14 20:27:57.434406850 +0200 @@ -0,0 +1,173 @@ +/* + * D-Link DIR-615 rev C1 board support @@ -3616,9 +3616,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-dir-615-c1.c linux-2.6.34/arch + +MIPS_MACHINE(AR71XX_MACH_DIR_615_C1, "DIR-615-C1", "D-Link DIR-615 rev. C1", + dir_615c1_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-825-b1.c linux-2.6.35.7/arch/mips/ar71xx/mach-dir-825-b1.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-dir-825-b1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-dir-825-b1.c 2010-10-14 20:27:57.478101111 +0200 @@ -0,0 +1,192 @@ +/* + * D-Link DIR-825 rev. B1 board support @@ -3812,9 +3812,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-dir-825-b1.c linux-2.6.34/arch + +MIPS_MACHINE(AR71XX_MACH_DIR_825_B1, "DIR-825-B1", "D-Link DIR-825 rev. B1", + dir825b1_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w04nu.c linux-2.6.35.7/arch/mips/ar71xx/mach-mzk-w04nu.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w04nu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-mzk-w04nu.c 2010-10-14 20:27:57.518101300 +0200 @@ -0,0 +1,165 @@ +/* + * Planex MZK-W04NU board support @@ -3981,9 +3981,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-mzk-w04nu.c linux-2.6.34/arch/ + +MIPS_MACHINE(AR71XX_MACH_MZK_W04NU, "MZK-W04NU", "Planex MZK-W04NU", + mzk_w04nu_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w300nh.c linux-2.6.35.7/arch/mips/ar71xx/mach-mzk-w300nh.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-mzk-w300nh.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-mzk-w300nh.c 2010-10-14 20:27:57.565601159 +0200 @@ -0,0 +1,158 @@ +/* + * Planex MZK-W300NH board support @@ -4143,9 +4143,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-mzk-w300nh.c linux-2.6.34/arch + +MIPS_MACHINE(AR71XX_MACH_MZK_W300NH, "MZK-W300NH", "Planex MZK-W300NH", + mzk_w300nh_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-nbg460n.c linux-2.6.35.7/arch/mips/ar71xx/mach-nbg460n.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-nbg460n.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-nbg460n.c 2010-10-14 20:27:57.617104398 +0200 @@ -0,0 +1,222 @@ +/* + * Zyxel NBG 460N/550N/550NH board support @@ -4369,9 +4369,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-nbg460n.c linux-2.6.34/arch/mi +} + +MIPS_MACHINE(AR71XX_MACH_NBG460N, "NBG460N", "Zyxel NBG460N/550N/550NH", nbg460n_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb42.c linux-2.6.35.7/arch/mips/ar71xx/mach-pb42.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb42.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-pb42.c 2010-10-14 20:27:57.665601166 +0200 @@ -0,0 +1,71 @@ +/* + * Atheros PB42 board support @@ -4444,9 +4444,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-pb42.c linux-2.6.34/arch/mips/ +} + +MIPS_MACHINE(AR71XX_MACH_PB42, "PB42", "Atheros PB42", pb42_init); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb44.c linux-2.6.35.7/arch/mips/ar71xx/mach-pb44.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb44.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-pb44.c 2010-10-14 20:27:57.725015448 +0200 @@ -0,0 +1,207 @@ +/* + * Atheros PB44 board support @@ -4655,9 +4655,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-pb44.c linux-2.6.34/arch/mips/ +} + +MIPS_MACHINE(AR71XX_MACH_PB44, "PB44", "Atheros PB44", pb44_init); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb92.c linux-2.6.35.7/arch/mips/ar71xx/mach-pb92.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-pb92.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-pb92.c 2010-10-14 20:27:57.774807434 +0200 @@ -0,0 +1,109 @@ +/* + * Atheros PB92 board support @@ -4768,9 +4768,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-pb92.c linux-2.6.34/arch/mips/ +} + +MIPS_MACHINE(AR71XX_MACH_PB92, "PB92", "Atheros PB92", pb92_init); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb4xx.c linux-2.6.35.7/arch/mips/ar71xx/mach-rb4xx.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb4xx.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-rb4xx.c 2010-10-14 20:27:57.824611115 +0200 @@ -0,0 +1,290 @@ +/* + * MikroTik RouterBOARD 4xx series support @@ -5062,9 +5062,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-rb4xx.c linux-2.6.34/arch/mips + +MIPS_MACHINE(AR71XX_MACH_RB_493, "493", "MikroTik RouterBOARD 493/AH", + rb493_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb750.c linux-2.6.35.7/arch/mips/ar71xx/mach-rb750.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-rb750.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-rb750.c 2010-10-14 20:27:57.874416755 +0200 @@ -0,0 +1,133 @@ +/* + * MikroTik RouterBOARD 750 support @@ -5199,9 +5199,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-rb750.c linux-2.6.34/arch/mips + +MIPS_MACHINE(AR71XX_MACH_RB_750, "750i", "MikroTik RouterBOARD 750", + rb750_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tew-632brp.c linux-2.6.35.7/arch/mips/ar71xx/mach-tew-632brp.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tew-632brp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-tew-632brp.c 2010-10-14 20:27:57.916006386 +0200 @@ -0,0 +1,149 @@ +/* + * TrendNET TEW-632BRP board support @@ -5352,9 +5352,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tew-632brp.c linux-2.6.34/arch + +MIPS_MACHINE(AR71XX_MACH_TEW_632BRP, "TEW-632BRP", "TRENDnet TEW-632BRP", + tew_632brp_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr1043nd.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr1043nd.c 2010-10-14 20:27:57.964353043 +0200 @@ -0,0 +1,156 @@ +/* + * TP-LINK TL-WR1043ND board support @@ -5512,9 +5512,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr1043nd.c linux-2.6.34/arc + +MIPS_MACHINE(AR71XX_MACH_TL_WR1043ND, "TL-WR1043ND", "TP-LINK TL-WR1043ND", + tl_wr1043nd_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr741nd.c linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr741nd.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr741nd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr741nd.c 2010-10-14 20:27:58.005601016 +0200 @@ -0,0 +1,115 @@ +/* + * TP-LINK TL-WR741ND board support @@ -5631,9 +5631,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr741nd.c linux-2.6.34/arch +} +MIPS_MACHINE(AR71XX_MACH_TL_WR741ND, "TL-WR741ND", "TP-LINK TL-WR741ND", + tl_wr741nd_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr841n.c linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr841n.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr841n.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr841n.c 2010-10-14 20:27:58.057141646 +0200 @@ -0,0 +1,143 @@ +/* + * TP-LINK TL-WR841N board support @@ -5778,9 +5778,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr841n.c linux-2.6.34/arch/ + +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.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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr941nd.c linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr941nd.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-tl-wr941nd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-tl-wr941nd.c 2010-10-14 20:27:58.095601080 +0200 @@ -0,0 +1,142 @@ +/* + * TP-LINK TL-WR941ND board support @@ -5924,9 +5924,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-tl-wr941nd.c linux-2.6.34/arch + +MIPS_MACHINE(AR71XX_MACH_TL_WR941ND, "TL-WR941ND", "TP-LINK TL-WR941ND", + tl_wr941nd_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/machtype.h linux-2.6.35.7/arch/mips/ar71xx/machtype.h +--- linux-2.6.35.7.orig/arch/mips/ar71xx/machtype.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/machtype.h 2010-10-14 20:27:58.135601194 +0200 @@ -0,0 +1,60 @@ +/* + * Atheros AR71xx machine type definitions @@ -5988,9 +5988,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/machtype.h linux-2.6.34/arch/mips/a +}; + +#endif /* _AR71XX_MACHTYPE_H */ -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ubnt.c linux-2.6.35.7/arch/mips/ar71xx/mach-ubnt.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-ubnt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-ubnt.c 2010-10-14 20:27:58.190029906 +0200 @@ -0,0 +1,281 @@ +/* + * Ubiquiti RouterStation support @@ -6273,9 +6273,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-ubnt.c linux-2.6.34/arch/mips/ + +MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M", + ubnt_nano_m_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wndr3700.c linux-2.6.35.7/arch/mips/ar71xx/mach-wndr3700.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wndr3700.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-wndr3700.c 2010-10-14 20:27:58.228101285 +0200 @@ -0,0 +1,209 @@ +/* + * Netgear WNDR3700 board support @@ -6486,9 +6486,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wndr3700.c linux-2.6.34/arch/m + +MIPS_MACHINE(AR71XX_MACH_WNDR3700, "WNDR3700", "NETGEAR WNDR3700", + wndr3700_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wnr2000.c linux-2.6.35.7/arch/mips/ar71xx/mach-wnr2000.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wnr2000.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-wnr2000.c 2010-10-14 20:27:58.268101150 +0200 @@ -0,0 +1,148 @@ +/* + * NETGEAR WNR2000 board support @@ -6638,9 +6638,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wnr2000.c linux-2.6.34/arch/mi +} + +MIPS_MACHINE(AR71XX_MACH_WNR2000, "WNR2000", "NETGEAR WNR2000", wnr2000_setup); -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 +diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wp543.c linux-2.6.35.7/arch/mips/ar71xx/mach-wp543.c +--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wp543.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.35.7/arch/mips/ar71xx/mach-wp543.c 2010-10-14 20:27:58.314545632 +0200 @@ -0,0 +1,99 @@ +/* |