summaryrefslogtreecommitdiff
path: root/target/rb4xx/patches
diff options
context:
space:
mode:
Diffstat (limited to 'target/rb4xx/patches')
-rw-r--r--target/rb4xx/patches/ar71xx.patch16431
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 @@
+/*
+ * Compex WP543/WPJ543 board support
@@ -6741,9 +6741,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wp543.c linux-2.6.34/arch/mips
+}
+
+MIPS_MACHINE(AR71XX_MACH_WP543, "WP543", "Compex WP543", wp543_setup);
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt160nl.c linux-2.6.35.7/arch/mips/ar71xx/mach-wrt160nl.c
+--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt160nl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/ar71xx/mach-wrt160nl.c 2010-10-14 20:27:58.364348612 +0200
@@ -0,0 +1,158 @@
+/*
+ * Linksys WRT160NL board support
@@ -6903,9 +6903,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wrt160nl.c linux-2.6.34/arch/m
+
+MIPS_MACHINE(AR71XX_MACH_WRT160NL, "WRT160NL", "Linksys WRT160NL",
+ wrt160nl_setup);
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt400n.c linux-2.6.35.7/arch/mips/ar71xx/mach-wrt400n.c
+--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wrt400n.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/ar71xx/mach-wrt400n.c 2010-10-14 20:27:58.414355031 +0200
@@ -0,0 +1,168 @@
+/*
+ * Linksys WRT400N board support
@@ -7075,9 +7075,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wrt400n.c linux-2.6.34/arch/mi
+}
+
+MIPS_MACHINE(AR71XX_MACH_WRT400N, "WRT400N", "Linksys WRT400N", wrt400n_setup);
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c linux-2.6.35.7/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
+--- linux-2.6.35.7.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/ar71xx/mach-wzr-hp-g300nh.c 2010-10-14 20:27:58.455673598 +0200
@@ -0,0 +1,265 @@
+/*
+ * Buffalo WZR-HP-G300NH board support
@@ -7344,9 +7344,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/mach-wzr-hp-g300nh.c linux-2.6.34/a
+
+MIPS_MACHINE(AR71XX_MACH_WZR_HP_G300NH, "WZR-HP-G300NH",
+ "Buffalo WZR-HP-G300NH", wzrhpg300nh_setup);
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/Makefile linux-2.6.35.7/arch/mips/ar71xx/Makefile
+--- linux-2.6.35.7.orig/arch/mips/ar71xx/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/ar71xx/Makefile 2010-10-14 20:27:58.505507309 +0200
@@ -0,0 +1,54 @@
+#
+# Makefile for the Atheros AR71xx SoC specific parts of the kernel
@@ -7402,9 +7402,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/Makefile linux-2.6.34/arch/mips/ar7
+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.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
+diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.c linux-2.6.35.7/arch/mips/ar71xx/nvram.c
+--- linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/ar71xx/nvram.c 2010-10-14 20:27:58.555317270 +0200
@@ -0,0 +1,75 @@
+/*
+ * Atheros AR71xx minimal nvram support
@@ -7481,9 +7481,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/nvram.c linux-2.6.34/arch/mips/ar71
+ vfree(buf);
+ return ret;
+}
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.h linux-2.6.35.7/arch/mips/ar71xx/nvram.h
+--- linux-2.6.35.7.orig/arch/mips/ar71xx/nvram.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/ar71xx/nvram.h 2010-10-14 20:27:58.608101134 +0200
@@ -0,0 +1,19 @@
+/*
+ * Atheros AR71xx minimal nvram support
@@ -7504,9 +7504,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/nvram.h linux-2.6.34/arch/mips/ar71
+ const char *name, char *mac) __init;
+
+#endif /* _AR71XX_NVRAM_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/pci.c linux-2.6.35.7/arch/mips/ar71xx/pci.c
+--- linux-2.6.35.7.orig/arch/mips/ar71xx/pci.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/ar71xx/pci.c 2010-10-14 20:27:58.654350228 +0200
@@ -0,0 +1,93 @@
+/*
+ * Atheros AR71xx PCI setup code
@@ -7601,9 +7601,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/pci.c linux-2.6.34/arch/mips/ar71xx
+
+ return ret;
+}
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/prom.c linux-2.6.35.7/arch/mips/ar71xx/prom.c
+--- linux-2.6.35.7.orig/arch/mips/ar71xx/prom.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/ar71xx/prom.c 2010-10-14 20:27:58.704773879 +0200
@@ -0,0 +1,105 @@
+/*
+ * Atheros AR71xx SoC specific prom routines
@@ -7710,9 +7710,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/prom.c linux-2.6.34/arch/mips/ar71x
+{
+ /* We do not have to prom memory to free */
+}
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/ar71xx/setup.c linux-2.6.35.7/arch/mips/ar71xx/setup.c
+--- linux-2.6.35.7.orig/arch/mips/ar71xx/setup.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/ar71xx/setup.c 2010-10-14 20:27:58.754579813 +0200
@@ -0,0 +1,310 @@
+/*
+ * Atheros AR71xx SoC specific setup
@@ -8024,9 +8024,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/ar71xx/setup.c linux-2.6.34/arch/mips/ar71
+
+MIPS_MACHINE(AR71XX_MACH_GENERIC, "Generic", "Generic AR71xx board",
+ ar71xx_generic_init);
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/ar71xx.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/ar71xx.h 2010-10-14 20:27:58.804410665 +0200
@@ -0,0 +1,514 @@
+/*
+ * Atheros AR71xx SoC specific definitions
@@ -8542,9 +8542,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/ar71xx.h linux-2.6
+#endif /* __ASSEMBLER__ */
+
+#endif /* __ASM_MACH_AR71XX_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h 2010-10-14 20:27:58.848101151 +0200
@@ -0,0 +1,26 @@
+/*
+ * AR91xx parallel flash driver platform data definitions
@@ -8572,9 +8572,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/ar91xx_flash.h lin
+};
+
+#endif /* __AR91XX_FLASH_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/cpu-feature-overrides.h 2010-10-14 20:27:58.895601086 +0200
@@ -0,0 +1,56 @@
+/*
+ * Atheros AR71xx specific CPU feature overrides
@@ -8632,9 +8632,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/cpu-feature-overri
+#define cpu_icache_line_size() 32
+
+#endif /* __ASM_MACH_AR71XX_CPU_FEATURE_OVERRIDES_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/gpio.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/gpio.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/gpio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/gpio.h 2010-10-14 20:27:58.945582628 +0200
@@ -0,0 +1,53 @@
+/*
+ * Atheros AR71xx GPIO API definitions
@@ -8689,9 +8689,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/gpio.h linux-2.6.3
+#define gpio_cansleep __gpio_cansleep
+
+#endif /* __ASM_MACH_AR71XX_GPIO_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/irq.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/irq.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/irq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/irq.h 2010-10-14 20:27:58.994356523 +0200
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
@@ -8710,9 +8710,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/irq.h linux-2.6.34
+#include_next <irq.h>
+
+#endif /* __ASM_MACH_AR71XX_IRQ_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.h 2010-10-14 20:27:59.045181409 +0200
@@ -0,0 +1,32 @@
+/*
+ * Atheros AR71xx specific kernel entry setup
@@ -8746,9 +8746,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/kernel-entry-init.
+ .endm
+
+#endif /* __ASM_MACH_AR71XX_KERNEL_ENTRY_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/mach-rb750.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/mach-rb750.h 2010-10-14 20:27:59.095024740 +0200
@@ -0,0 +1,66 @@
+/*
+ * MikroTik RouterBOARD 750 definitions
@@ -8817,9 +8817,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/mach-rb750.h linux
+
+#endif /* _MACH_RB750_H */
\ No newline at end of file
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/mangle-port.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/mangle-port.h 2010-10-14 20:27:59.144833241 +0200
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
@@ -8866,9 +8866,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/mangle-port.h linu
+#endif
+
+#endif /* __ASM_MACH_AR71XX_MANGLE_PORT_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/pci.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/pci.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/pci.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/pci.h 2010-10-14 20:27:59.194642423 +0200
@@ -0,0 +1,39 @@
+/*
+ * Atheros AR71xx SoC specific PCI definitions
@@ -8909,9 +8909,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/pci.h linux-2.6.34
+int ar71xx_pci_init(unsigned nr_irqs, struct ar71xx_pci_irq *map) __init;
+
+#endif /* __ASM_MACH_AR71XX_PCI_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/platform.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/platform.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/platform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/platform.h 2010-10-14 20:27:59.252778691 +0200
@@ -0,0 +1,61 @@
+/*
+ * Atheros AR71xx SoC specific platform data definitions
@@ -8974,9 +8974,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/platform.h linux-2
+#define AR71XX_SPI_CS_ACTIVE 1
+
+#endif /* __ASM_MACH_AR71XX_PLATFORM_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/war.h linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/war.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mach-ar71xx/war.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mach-ar71xx/war.h 2010-10-14 20:27:59.295939760 +0200
@@ -0,0 +1,25 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -9003,9 +9003,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mach-ar71xx/war.h linux-2.6.34
+#define MIPS34K_MISSED_ITLB_WAR 0
+
+#endif /* __ASM_MACH_AR71XX_WAR_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/mips_machine.h linux-2.6.35.7/arch/mips/include/asm/mips_machine.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/mips_machine.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/include/asm/mips_machine.h 2010-10-14 20:27:59.335601098 +0200
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
@@ -9061,9 +9061,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/mips_machine.h linux-2.6.34/ar
+pure_initcall(register_machine_##_type)
+
+#endif /* __ASM_MIPS_MACHINE_H */
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/include/asm/time.h linux-2.6.35.7/arch/mips/include/asm/time.h
+--- linux-2.6.35.7.orig/arch/mips/include/asm/time.h 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/mips/include/asm/time.h 2010-10-14 20:27:59.385601208 +0200
@@ -52,6 +52,7 @@
*/
#ifdef CONFIG_CEVT_R4K_LIB
@@ -9072,9 +9072,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/include/asm/time.h linux-2.6.34/arch/mips/
extern int r4k_clockevent_init(void);
#endif
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/Kconfig linux-2.6.35.7/arch/mips/Kconfig
+--- linux-2.6.35.7.orig/arch/mips/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/mips/Kconfig 2010-10-14 20:27:59.436851139 +0200
@@ -48,6 +48,23 @@
Support for the Texas Instruments AR7 System-on-a-Chip
family: TNETD7100, 7200 and 7300.
@@ -9123,9 +9123,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/Kconfig linux-2.6.34/arch/mips/Kconfig
config NO_IOPORT
def_bool n
-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
+diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/Makefile linux-2.6.35.7/arch/mips/kernel/Makefile
+--- linux-2.6.35.7.orig/arch/mips/kernel/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/mips/kernel/Makefile 2010-10-14 20:27:59.485313916 +0200
@@ -93,6 +93,7 @@
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
@@ -9134,9 +9134,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/kernel/Makefile linux-2.6.34/arch/mips/ker
obj-$(CONFIG_SPINLOCK_TEST) += spinlock_test.o
CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
-diff -Nur linux-2.6.34.orig/arch/mips/kernel/mips_machine.c linux-2.6.34/arch/mips/kernel/mips_machine.c
---- linux-2.6.34.orig/arch/mips/kernel/mips_machine.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/arch/mips/kernel/mips_machine.c 2010-05-25 19:08:53.143473119 +0200
+diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/mips_machine.c linux-2.6.35.7/arch/mips/kernel/mips_machine.c
+--- linux-2.6.35.7.orig/arch/mips/kernel/mips_machine.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/kernel/mips_machine.c 2010-10-14 20:27:59.536722433 +0200
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
@@ -9259,9 +9259,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/kernel/mips_machine.c linux-2.6.34/arch/mi
+}
+
+core_initcall(mips_machtype_init);
-diff -Nur linux-2.6.34.orig/arch/mips/kernel/proc.c linux-2.6.34/arch/mips/kernel/proc.c
---- linux-2.6.34.orig/arch/mips/kernel/proc.c 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/mips/kernel/proc.c 2010-05-25 18:46:08.072223162 +0200
+diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/proc.c linux-2.6.35.7/arch/mips/kernel/proc.c
+--- linux-2.6.35.7.orig/arch/mips/kernel/proc.c 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/mips/kernel/proc.c 2010-10-14 20:27:59.578101125 +0200
@@ -12,6 +12,7 @@
#include <asm/cpu-features.h>
#include <asm/mipsregs.h>
@@ -9284,10 +9284,10 @@ diff -Nur linux-2.6.34.orig/arch/mips/kernel/proc.c linux-2.6.34/arch/mips/kerne
seq_printf(m, "processor\t\t: %ld\n", n);
sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
-diff -Nur linux-2.6.34.orig/arch/mips/kernel/traps.c linux-2.6.34/arch/mips/kernel/traps.c
---- linux-2.6.34.orig/arch/mips/kernel/traps.c 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/mips/kernel/traps.c 2010-05-25 19:01:23.272222993 +0200
-@@ -50,6 +50,7 @@
+diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/traps.c linux-2.6.35.7/arch/mips/kernel/traps.c
+--- linux-2.6.35.7.orig/arch/mips/kernel/traps.c 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/mips/kernel/traps.c 2010-10-14 20:27:59.634370215 +0200
+@@ -51,6 +51,7 @@
#include <asm/types.h>
#include <asm/stacktrace.h>
#include <asm/irq.h>
@@ -9295,7 +9295,7 @@ diff -Nur linux-2.6.34.orig/arch/mips/kernel/traps.c linux-2.6.34/arch/mips/kern
#include <asm/uasm.h>
extern void check_wait(void);
-@@ -1506,6 +1507,8 @@
+@@ -1519,6 +1520,8 @@
if (cpu_has_mips_r2) {
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
@@ -9304,9 +9304,1751 @@ diff -Nur linux-2.6.34.orig/arch/mips/kernel/traps.c linux-2.6.34/arch/mips/kern
cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
if (cp0_perfcount_irq == cp0_compare_irq)
cp0_perfcount_irq = -1;
-diff -Nur linux-2.6.34.orig/arch/mips/Makefile linux-2.6.34/arch/mips/Makefile
---- linux-2.6.34.orig/arch/mips/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/mips/Makefile 2010-05-25 18:46:08.530007292 +0200
+diff -Nur linux-2.6.35.7.orig/arch/mips/kernel/traps.c.orig linux-2.6.35.7/arch/mips/kernel/traps.c.orig
+--- linux-2.6.35.7.orig/arch/mips/kernel/traps.c.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/kernel/traps.c.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,1738 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 1994 - 1999, 2000, 01, 06 Ralf Baechle
++ * Copyright (C) 1995, 1996 Paul M. Antoine
++ * Copyright (C) 1998 Ulf Carlsson
++ * Copyright (C) 1999 Silicon Graphics, Inc.
++ * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
++ * Copyright (C) 2000, 01 MIPS Technologies, Inc.
++ * Copyright (C) 2002, 2003, 2004, 2005, 2007 Maciej W. Rozycki
++ */
++#include <linux/bug.h>
++#include <linux/compiler.h>
++#include <linux/init.h>
++#include <linux/mm.h>
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/smp.h>
++#include <linux/spinlock.h>
++#include <linux/kallsyms.h>
++#include <linux/bootmem.h>
++#include <linux/interrupt.h>
++#include <linux/ptrace.h>
++#include <linux/kgdb.h>
++#include <linux/kdebug.h>
++#include <linux/notifier.h>
++#include <linux/kdb.h>
++
++#include <asm/bootinfo.h>
++#include <asm/branch.h>
++#include <asm/break.h>
++#include <asm/cop2.h>
++#include <asm/cpu.h>
++#include <asm/dsp.h>
++#include <asm/fpu.h>
++#include <asm/fpu_emulator.h>
++#include <asm/mipsregs.h>
++#include <asm/mipsmtregs.h>
++#include <asm/module.h>
++#include <asm/pgtable.h>
++#include <asm/ptrace.h>
++#include <asm/sections.h>
++#include <asm/system.h>
++#include <asm/tlbdebug.h>
++#include <asm/traps.h>
++#include <asm/uaccess.h>
++#include <asm/watch.h>
++#include <asm/mmu_context.h>
++#include <asm/types.h>
++#include <asm/stacktrace.h>
++#include <asm/irq.h>
++#include <asm/uasm.h>
++
++extern void check_wait(void);
++extern asmlinkage void r4k_wait(void);
++extern asmlinkage void rollback_handle_int(void);
++extern asmlinkage void handle_int(void);
++extern asmlinkage void handle_tlbm(void);
++extern asmlinkage void handle_tlbl(void);
++extern asmlinkage void handle_tlbs(void);
++extern asmlinkage void handle_adel(void);
++extern asmlinkage void handle_ades(void);
++extern asmlinkage void handle_ibe(void);
++extern asmlinkage void handle_dbe(void);
++extern asmlinkage void handle_sys(void);
++extern asmlinkage void handle_bp(void);
++extern asmlinkage void handle_ri(void);
++extern asmlinkage void handle_ri_rdhwr_vivt(void);
++extern asmlinkage void handle_ri_rdhwr(void);
++extern asmlinkage void handle_cpu(void);
++extern asmlinkage void handle_ov(void);
++extern asmlinkage void handle_tr(void);
++extern asmlinkage void handle_fpe(void);
++extern asmlinkage void handle_mdmx(void);
++extern asmlinkage void handle_watch(void);
++extern asmlinkage void handle_mt(void);
++extern asmlinkage void handle_dsp(void);
++extern asmlinkage void handle_mcheck(void);
++extern asmlinkage void handle_reserved(void);
++
++extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
++ struct mips_fpu_struct *ctx, int has_fpu);
++
++void (*board_be_init)(void);
++int (*board_be_handler)(struct pt_regs *regs, int is_fixup);
++void (*board_nmi_handler_setup)(void);
++void (*board_ejtag_handler_setup)(void);
++void (*board_bind_eic_interrupt)(int irq, int regset);
++
++
++static void show_raw_backtrace(unsigned long reg29)
++{
++ unsigned long *sp = (unsigned long *)(reg29 & ~3);
++ unsigned long addr;
++
++ printk("Call Trace:");
++#ifdef CONFIG_KALLSYMS
++ printk("\n");
++#endif
++ while (!kstack_end(sp)) {
++ unsigned long __user *p =
++ (unsigned long __user *)(unsigned long)sp++;
++ if (__get_user(addr, p)) {
++ printk(" (Bad stack address)");
++ break;
++ }
++ if (__kernel_text_address(addr))
++ print_ip_sym(addr);
++ }
++ printk("\n");
++}
++
++#ifdef CONFIG_KALLSYMS
++int raw_show_trace;
++static int __init set_raw_show_trace(char *str)
++{
++ raw_show_trace = 1;
++ return 1;
++}
++__setup("raw_show_trace", set_raw_show_trace);
++#endif
++
++static void show_backtrace(struct task_struct *task, const struct pt_regs *regs)
++{
++ unsigned long sp = regs->regs[29];
++ unsigned long ra = regs->regs[31];
++ unsigned long pc = regs->cp0_epc;
++
++ if (raw_show_trace || !__kernel_text_address(pc)) {
++ show_raw_backtrace(sp);
++ return;
++ }
++ printk("Call Trace:\n");
++ do {
++ print_ip_sym(pc);
++ pc = unwind_stack(task, &sp, pc, &ra);
++ } while (pc);
++ printk("\n");
++}
++
++/*
++ * This routine abuses get_user()/put_user() to reference pointers
++ * with at least a bit of error checking ...
++ */
++static void show_stacktrace(struct task_struct *task,
++ const struct pt_regs *regs)
++{
++ const int field = 2 * sizeof(unsigned long);
++ long stackdata;
++ int i;
++ unsigned long __user *sp = (unsigned long __user *)regs->regs[29];
++
++ printk("Stack :");
++ i = 0;
++ while ((unsigned long) sp & (PAGE_SIZE - 1)) {
++ if (i && ((i % (64 / field)) == 0))
++ printk("\n ");
++ if (i > 39) {
++ printk(" ...");
++ break;
++ }
++
++ if (__get_user(stackdata, sp++)) {
++ printk(" (Bad stack address)");
++ break;
++ }
++
++ printk(" %0*lx", field, stackdata);
++ i++;
++ }
++ printk("\n");
++ show_backtrace(task, regs);
++}
++
++void show_stack(struct task_struct *task, unsigned long *sp)
++{
++ struct pt_regs regs;
++ if (sp) {
++ regs.regs[29] = (unsigned long)sp;
++ regs.regs[31] = 0;
++ regs.cp0_epc = 0;
++ } else {
++ if (task && task != current) {
++ regs.regs[29] = task->thread.reg29;
++ regs.regs[31] = 0;
++ regs.cp0_epc = task->thread.reg31;
++#ifdef CONFIG_KGDB_KDB
++ } else if (atomic_read(&kgdb_active) != -1 &&
++ kdb_current_regs) {
++ memcpy(&regs, kdb_current_regs, sizeof(regs));
++#endif /* CONFIG_KGDB_KDB */
++ } else {
++ prepare_frametrace(&regs);
++ }
++ }
++ show_stacktrace(task, &regs);
++}
++
++/*
++ * The architecture-independent dump_stack generator
++ */
++void dump_stack(void)
++{
++ struct pt_regs regs;
++
++ prepare_frametrace(&regs);
++ show_backtrace(current, &regs);
++}
++
++EXPORT_SYMBOL(dump_stack);
++
++static void show_code(unsigned int __user *pc)
++{
++ long i;
++ unsigned short __user *pc16 = NULL;
++
++ printk("\nCode:");
++
++ if ((unsigned long)pc & 1)
++ pc16 = (unsigned short __user *)((unsigned long)pc & ~1);
++ for(i = -3 ; i < 6 ; i++) {
++ unsigned int insn;
++ if (pc16 ? __get_user(insn, pc16 + i) : __get_user(insn, pc + i)) {
++ printk(" (Bad address in epc)\n");
++ break;
++ }
++ printk("%c%0*x%c", (i?' ':'<'), pc16 ? 4 : 8, insn, (i?' ':'>'));
++ }
++}
++
++static void __show_regs(const struct pt_regs *regs)
++{
++ const int field = 2 * sizeof(unsigned long);
++ unsigned int cause = regs->cp0_cause;
++ int i;
++
++ printk("Cpu %d\n", smp_processor_id());
++
++ /*
++ * Saved main processor registers
++ */
++ for (i = 0; i < 32; ) {
++ if ((i % 4) == 0)
++ printk("$%2d :", i);
++ if (i == 0)
++ printk(" %0*lx", field, 0UL);
++ else if (i == 26 || i == 27)
++ printk(" %*s", field, "");
++ else
++ printk(" %0*lx", field, regs->regs[i]);
++
++ i++;
++ if ((i % 4) == 0)
++ printk("\n");
++ }
++
++#ifdef CONFIG_CPU_HAS_SMARTMIPS
++ printk("Acx : %0*lx\n", field, regs->acx);
++#endif
++ printk("Hi : %0*lx\n", field, regs->hi);
++ printk("Lo : %0*lx\n", field, regs->lo);
++
++ /*
++ * Saved cp0 registers
++ */
++ printk("epc : %0*lx %pS\n", field, regs->cp0_epc,
++ (void *) regs->cp0_epc);
++ printk(" %s\n", print_tainted());
++ printk("ra : %0*lx %pS\n", field, regs->regs[31],
++ (void *) regs->regs[31]);
++
++ printk("Status: %08x ", (uint32_t) regs->cp0_status);
++
++ if (current_cpu_data.isa_level == MIPS_CPU_ISA_I) {
++ if (regs->cp0_status & ST0_KUO)
++ printk("KUo ");
++ if (regs->cp0_status & ST0_IEO)
++ printk("IEo ");
++ if (regs->cp0_status & ST0_KUP)
++ printk("KUp ");
++ if (regs->cp0_status & ST0_IEP)
++ printk("IEp ");
++ if (regs->cp0_status & ST0_KUC)
++ printk("KUc ");
++ if (regs->cp0_status & ST0_IEC)
++ printk("IEc ");
++ } else {
++ if (regs->cp0_status & ST0_KX)
++ printk("KX ");
++ if (regs->cp0_status & ST0_SX)
++ printk("SX ");
++ if (regs->cp0_status & ST0_UX)
++ printk("UX ");
++ switch (regs->cp0_status & ST0_KSU) {
++ case KSU_USER:
++ printk("USER ");
++ break;
++ case KSU_SUPERVISOR:
++ printk("SUPERVISOR ");
++ break;
++ case KSU_KERNEL:
++ printk("KERNEL ");
++ break;
++ default:
++ printk("BAD_MODE ");
++ break;
++ }
++ if (regs->cp0_status & ST0_ERL)
++ printk("ERL ");
++ if (regs->cp0_status & ST0_EXL)
++ printk("EXL ");
++ if (regs->cp0_status & ST0_IE)
++ printk("IE ");
++ }
++ printk("\n");
++
++ printk("Cause : %08x\n", cause);
++
++ cause = (cause & CAUSEF_EXCCODE) >> CAUSEB_EXCCODE;
++ if (1 <= cause && cause <= 5)
++ printk("BadVA : %0*lx\n", field, regs->cp0_badvaddr);
++
++ printk("PrId : %08x (%s)\n", read_c0_prid(),
++ cpu_name_string());
++}
++
++/*
++ * FIXME: really the generic show_regs should take a const pointer argument.
++ */
++void show_regs(struct pt_regs *regs)
++{
++ __show_regs((struct pt_regs *)regs);
++}
++
++void show_registers(const struct pt_regs *regs)
++{
++ const int field = 2 * sizeof(unsigned long);
++
++ __show_regs(regs);
++ print_modules();
++ printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
++ current->comm, current->pid, current_thread_info(), current,
++ field, current_thread_info()->tp_value);
++ if (cpu_has_userlocal) {
++ unsigned long tls;
++
++ tls = read_c0_userlocal();
++ if (tls != current_thread_info()->tp_value)
++ printk("*HwTLS: %0*lx\n", field, tls);
++ }
++
++ show_stacktrace(current, regs);
++ show_code((unsigned int __user *) regs->cp0_epc);
++ printk("\n");
++}
++
++static DEFINE_SPINLOCK(die_lock);
++
++void __noreturn die(const char * str, struct pt_regs * regs)
++{
++ static int die_counter;
++ int sig = SIGSEGV;
++#ifdef CONFIG_MIPS_MT_SMTC
++ unsigned long dvpret = dvpe();
++#endif /* CONFIG_MIPS_MT_SMTC */
++
++ notify_die(DIE_OOPS, str, (struct pt_regs *)regs, SIGSEGV, 0, 0);
++
++ console_verbose();
++ spin_lock_irq(&die_lock);
++ bust_spinlocks(1);
++#ifdef CONFIG_MIPS_MT_SMTC
++ mips_mt_regdump(dvpret);
++#endif /* CONFIG_MIPS_MT_SMTC */
++
++ if (notify_die(DIE_OOPS, str, regs, 0, current->thread.trap_no, SIGSEGV) == NOTIFY_STOP)
++ sig = 0;
++
++ printk("%s[#%d]:\n", str, ++die_counter);
++ show_registers(regs);
++ add_taint(TAINT_DIE);
++ spin_unlock_irq(&die_lock);
++
++ if (in_interrupt())
++ panic("Fatal exception in interrupt");
++
++ if (panic_on_oops) {
++ printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
++ ssleep(5);
++ panic("Fatal exception");
++ }
++
++ do_exit(sig);
++}
++
++extern struct exception_table_entry __start___dbe_table[];
++extern struct exception_table_entry __stop___dbe_table[];
++
++__asm__(
++" .section __dbe_table, \"a\"\n"
++" .previous \n");
++
++/* Given an address, look for it in the exception tables. */
++static const struct exception_table_entry *search_dbe_tables(unsigned long addr)
++{
++ const struct exception_table_entry *e;
++
++ e = search_extable(__start___dbe_table, __stop___dbe_table - 1, addr);
++ if (!e)
++ e = search_module_dbetables(addr);
++ return e;
++}
++
++asmlinkage void do_be(struct pt_regs *regs)
++{
++ const int field = 2 * sizeof(unsigned long);
++ const struct exception_table_entry *fixup = NULL;
++ int data = regs->cp0_cause & 4;
++ int action = MIPS_BE_FATAL;
++
++ /* XXX For now. Fixme, this searches the wrong table ... */
++ if (data && !user_mode(regs))
++ fixup = search_dbe_tables(exception_epc(regs));
++
++ if (fixup)
++ action = MIPS_BE_FIXUP;
++
++ if (board_be_handler)
++ action = board_be_handler(regs, fixup != NULL);
++
++ switch (action) {
++ case MIPS_BE_DISCARD:
++ return;
++ case MIPS_BE_FIXUP:
++ if (fixup) {
++ regs->cp0_epc = fixup->nextinsn;
++ return;
++ }
++ break;
++ default:
++ break;
++ }
++
++ /*
++ * Assume it would be too dangerous to continue ...
++ */
++ printk(KERN_ALERT "%s bus error, epc == %0*lx, ra == %0*lx\n",
++ data ? "Data" : "Instruction",
++ field, regs->cp0_epc, field, regs->regs[31]);
++ if (notify_die(DIE_OOPS, "bus error", regs, SIGBUS, 0, 0)
++ == NOTIFY_STOP)
++ return;
++
++ die_if_kernel("Oops", regs);
++ force_sig(SIGBUS, current);
++}
++
++/*
++ * ll/sc, rdhwr, sync emulation
++ */
++
++#define OPCODE 0xfc000000
++#define BASE 0x03e00000
++#define RT 0x001f0000
++#define OFFSET 0x0000ffff
++#define LL 0xc0000000
++#define SC 0xe0000000
++#define SPEC0 0x00000000
++#define SPEC3 0x7c000000
++#define RD 0x0000f800
++#define FUNC 0x0000003f
++#define SYNC 0x0000000f
++#define RDHWR 0x0000003b
++
++/*
++ * The ll_bit is cleared by r*_switch.S
++ */
++
++unsigned int ll_bit;
++struct task_struct *ll_task;
++
++static inline int simulate_ll(struct pt_regs *regs, unsigned int opcode)
++{
++ unsigned long value, __user *vaddr;
++ long offset;
++
++ /*
++ * analyse the ll instruction that just caused a ri exception
++ * and put the referenced address to addr.
++ */
++
++ /* sign extend offset */
++ offset = opcode & OFFSET;
++ offset <<= 16;
++ offset >>= 16;
++
++ vaddr = (unsigned long __user *)
++ ((unsigned long)(regs->regs[(opcode & BASE) >> 21]) + offset);
++
++ if ((unsigned long)vaddr & 3)
++ return SIGBUS;
++ if (get_user(value, vaddr))
++ return SIGSEGV;
++
++ preempt_disable();
++
++ if (ll_task == NULL || ll_task == current) {
++ ll_bit = 1;
++ } else {
++ ll_bit = 0;
++ }
++ ll_task = current;
++
++ preempt_enable();
++
++ regs->regs[(opcode & RT) >> 16] = value;
++
++ return 0;
++}
++
++static inline int simulate_sc(struct pt_regs *regs, unsigned int opcode)
++{
++ unsigned long __user *vaddr;
++ unsigned long reg;
++ long offset;
++
++ /*
++ * analyse the sc instruction that just caused a ri exception
++ * and put the referenced address to addr.
++ */
++
++ /* sign extend offset */
++ offset = opcode & OFFSET;
++ offset <<= 16;
++ offset >>= 16;
++
++ vaddr = (unsigned long __user *)
++ ((unsigned long)(regs->regs[(opcode & BASE) >> 21]) + offset);
++ reg = (opcode & RT) >> 16;
++
++ if ((unsigned long)vaddr & 3)
++ return SIGBUS;
++
++ preempt_disable();
++
++ if (ll_bit == 0 || ll_task != current) {
++ regs->regs[reg] = 0;
++ preempt_enable();
++ return 0;
++ }
++
++ preempt_enable();
++
++ if (put_user(regs->regs[reg], vaddr))
++ return SIGSEGV;
++
++ regs->regs[reg] = 1;
++
++ return 0;
++}
++
++/*
++ * ll uses the opcode of lwc0 and sc uses the opcode of swc0. That is both
++ * opcodes are supposed to result in coprocessor unusable exceptions if
++ * executed on ll/sc-less processors. That's the theory. In practice a
++ * few processors such as NEC's VR4100 throw reserved instruction exceptions
++ * instead, so we're doing the emulation thing in both exception handlers.
++ */
++static int simulate_llsc(struct pt_regs *regs, unsigned int opcode)
++{
++ if ((opcode & OPCODE) == LL)
++ return simulate_ll(regs, opcode);
++ if ((opcode & OPCODE) == SC)
++ return simulate_sc(regs, opcode);
++
++ return -1; /* Must be something else ... */
++}
++
++/*
++ * Simulate trapping 'rdhwr' instructions to provide user accessible
++ * registers not implemented in hardware.
++ */
++static int simulate_rdhwr(struct pt_regs *regs, unsigned int opcode)
++{
++ struct thread_info *ti = task_thread_info(current);
++
++ if ((opcode & OPCODE) == SPEC3 && (opcode & FUNC) == RDHWR) {
++ int rd = (opcode & RD) >> 11;
++ int rt = (opcode & RT) >> 16;
++ switch (rd) {
++ case 0: /* CPU number */
++ regs->regs[rt] = smp_processor_id();
++ return 0;
++ case 1: /* SYNCI length */
++ regs->regs[rt] = min(current_cpu_data.dcache.linesz,
++ current_cpu_data.icache.linesz);
++ return 0;
++ case 2: /* Read count register */
++ regs->regs[rt] = read_c0_count();
++ return 0;
++ case 3: /* Count register resolution */
++ switch (current_cpu_data.cputype) {
++ case CPU_20KC:
++ case CPU_25KF:
++ regs->regs[rt] = 1;
++ break;
++ default:
++ regs->regs[rt] = 2;
++ }
++ return 0;
++ case 29:
++ regs->regs[rt] = ti->tp_value;
++ return 0;
++ default:
++ return -1;
++ }
++ }
++
++ /* Not ours. */
++ return -1;
++}
++
++static int simulate_sync(struct pt_regs *regs, unsigned int opcode)
++{
++ if ((opcode & OPCODE) == SPEC0 && (opcode & FUNC) == SYNC)
++ return 0;
++
++ return -1; /* Must be something else ... */
++}
++
++asmlinkage void do_ov(struct pt_regs *regs)
++{
++ siginfo_t info;
++
++ die_if_kernel("Integer overflow", regs);
++
++ info.si_code = FPE_INTOVF;
++ info.si_signo = SIGFPE;
++ info.si_errno = 0;
++ info.si_addr = (void __user *) regs->cp0_epc;
++ force_sig_info(SIGFPE, &info, current);
++}
++
++/*
++ * XXX Delayed fp exceptions when doing a lazy ctx switch XXX
++ */
++asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
++{
++ siginfo_t info;
++
++ if (notify_die(DIE_FP, "FP exception", regs, SIGFPE, 0, 0)
++ == NOTIFY_STOP)
++ return;
++ die_if_kernel("FP exception in kernel code", regs);
++
++ if (fcr31 & FPU_CSR_UNI_X) {
++ int sig;
++
++ /*
++ * Unimplemented operation exception. If we've got the full
++ * software emulator on-board, let's use it...
++ *
++ * Force FPU to dump state into task/thread context. We're
++ * moving a lot of data here for what is probably a single
++ * instruction, but the alternative is to pre-decode the FP
++ * register operands before invoking the emulator, which seems
++ * a bit extreme for what should be an infrequent event.
++ */
++ /* Ensure 'resume' not overwrite saved fp context again. */
++ lose_fpu(1);
++
++ /* Run the emulator */
++ sig = fpu_emulator_cop1Handler(regs, &current->thread.fpu, 1);
++
++ /*
++ * We can't allow the emulated instruction to leave any of
++ * the cause bit set in $fcr31.
++ */
++ current->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
++
++ /* Restore the hardware register state */
++ own_fpu(1); /* Using the FPU again. */
++
++ /* If something went wrong, signal */
++ if (sig)
++ force_sig(sig, current);
++
++ return;
++ } else if (fcr31 & FPU_CSR_INV_X)
++ info.si_code = FPE_FLTINV;
++ else if (fcr31 & FPU_CSR_DIV_X)
++ info.si_code = FPE_FLTDIV;
++ else if (fcr31 & FPU_CSR_OVF_X)
++ info.si_code = FPE_FLTOVF;
++ else if (fcr31 & FPU_CSR_UDF_X)
++ info.si_code = FPE_FLTUND;
++ else if (fcr31 & FPU_CSR_INE_X)
++ info.si_code = FPE_FLTRES;
++ else
++ info.si_code = __SI_FAULT;
++ info.si_signo = SIGFPE;
++ info.si_errno = 0;
++ info.si_addr = (void __user *) regs->cp0_epc;
++ force_sig_info(SIGFPE, &info, current);
++}
++
++static void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
++ const char *str)
++{
++ siginfo_t info;
++ char b[40];
++
++#ifdef CONFIG_KGDB_LOW_LEVEL_TRAP
++ if (kgdb_ll_trap(DIE_TRAP, str, regs, code, 0, 0) == NOTIFY_STOP)
++ return;
++#endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */
++
++ if (notify_die(DIE_TRAP, str, regs, code, 0, 0) == NOTIFY_STOP)
++ return;
++
++ /*
++ * A short test says that IRIX 5.3 sends SIGTRAP for all trap
++ * insns, even for trap and break codes that indicate arithmetic
++ * failures. Weird ...
++ * But should we continue the brokenness??? --macro
++ */
++ switch (code) {
++ case BRK_OVERFLOW:
++ case BRK_DIVZERO:
++ scnprintf(b, sizeof(b), "%s instruction in kernel code", str);
++ die_if_kernel(b, regs);
++ if (code == BRK_DIVZERO)
++ info.si_code = FPE_INTDIV;
++ else
++ info.si_code = FPE_INTOVF;
++ info.si_signo = SIGFPE;
++ info.si_errno = 0;
++ info.si_addr = (void __user *) regs->cp0_epc;
++ force_sig_info(SIGFPE, &info, current);
++ break;
++ case BRK_BUG:
++ die_if_kernel("Kernel bug detected", regs);
++ force_sig(SIGTRAP, current);
++ break;
++ case BRK_MEMU:
++ /*
++ * Address errors may be deliberately induced by the FPU
++ * emulator to retake control of the CPU after executing the
++ * instruction in the delay slot of an emulated branch.
++ *
++ * Terminate if exception was recognized as a delay slot return
++ * otherwise handle as normal.
++ */
++ if (do_dsemulret(regs))
++ return;
++
++ die_if_kernel("Math emu break/trap", regs);
++ force_sig(SIGTRAP, current);
++ break;
++ default:
++ scnprintf(b, sizeof(b), "%s instruction in kernel code", str);
++ die_if_kernel(b, regs);
++ force_sig(SIGTRAP, current);
++ }
++}
++
++asmlinkage void do_bp(struct pt_regs *regs)
++{
++ unsigned int opcode, bcode;
++
++ if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
++ goto out_sigsegv;
++
++ /*
++ * There is the ancient bug in the MIPS assemblers that the break
++ * code starts left to bit 16 instead to bit 6 in the opcode.
++ * Gas is bug-compatible, but not always, grrr...
++ * We handle both cases with a simple heuristics. --macro
++ */
++ bcode = ((opcode >> 6) & ((1 << 20) - 1));
++ if (bcode >= (1 << 10))
++ bcode >>= 10;
++
++ do_trap_or_bp(regs, bcode, "Break");
++ return;
++
++out_sigsegv:
++ force_sig(SIGSEGV, current);
++}
++
++asmlinkage void do_tr(struct pt_regs *regs)
++{
++ unsigned int opcode, tcode = 0;
++
++ if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
++ goto out_sigsegv;
++
++ /* Immediate versions don't provide a code. */
++ if (!(opcode & OPCODE))
++ tcode = ((opcode >> 6) & ((1 << 10) - 1));
++
++ do_trap_or_bp(regs, tcode, "Trap");
++ return;
++
++out_sigsegv:
++ force_sig(SIGSEGV, current);
++}
++
++asmlinkage void do_ri(struct pt_regs *regs)
++{
++ unsigned int __user *epc = (unsigned int __user *)exception_epc(regs);
++ unsigned long old_epc = regs->cp0_epc;
++ unsigned int opcode = 0;
++ int status = -1;
++
++ if (notify_die(DIE_RI, "RI Fault", regs, SIGSEGV, 0, 0)
++ == NOTIFY_STOP)
++ return;
++
++ die_if_kernel("Reserved instruction in kernel code", regs);
++
++ if (unlikely(compute_return_epc(regs) < 0))
++ return;
++
++ if (unlikely(get_user(opcode, epc) < 0))
++ status = SIGSEGV;
++
++ if (!cpu_has_llsc && status < 0)
++ status = simulate_llsc(regs, opcode);
++
++ if (status < 0)
++ status = simulate_rdhwr(regs, opcode);
++
++ if (status < 0)
++ status = simulate_sync(regs, opcode);
++
++ if (status < 0)
++ status = SIGILL;
++
++ if (unlikely(status > 0)) {
++ regs->cp0_epc = old_epc; /* Undo skip-over. */
++ force_sig(status, current);
++ }
++}
++
++/*
++ * MIPS MT processors may have fewer FPU contexts than CPU threads. If we've
++ * emulated more than some threshold number of instructions, force migration to
++ * a "CPU" that has FP support.
++ */
++static void mt_ase_fp_affinity(void)
++{
++#ifdef CONFIG_MIPS_MT_FPAFF
++ if (mt_fpemul_threshold > 0 &&
++ ((current->thread.emulated_fp++ > mt_fpemul_threshold))) {
++ /*
++ * If there's no FPU present, or if the application has already
++ * restricted the allowed set to exclude any CPUs with FPUs,
++ * we'll skip the procedure.
++ */
++ if (cpus_intersects(current->cpus_allowed, mt_fpu_cpumask)) {
++ cpumask_t tmask;
++
++ current->thread.user_cpus_allowed
++ = current->cpus_allowed;
++ cpus_and(tmask, current->cpus_allowed,
++ mt_fpu_cpumask);
++ set_cpus_allowed_ptr(current, &tmask);
++ set_thread_flag(TIF_FPUBOUND);
++ }
++ }
++#endif /* CONFIG_MIPS_MT_FPAFF */
++}
++
++/*
++ * No lock; only written during early bootup by CPU 0.
++ */
++static RAW_NOTIFIER_HEAD(cu2_chain);
++
++int __ref register_cu2_notifier(struct notifier_block *nb)
++{
++ return raw_notifier_chain_register(&cu2_chain, nb);
++}
++
++int cu2_notifier_call_chain(unsigned long val, void *v)
++{
++ return raw_notifier_call_chain(&cu2_chain, val, v);
++}
++
++static int default_cu2_call(struct notifier_block *nfb, unsigned long action,
++ void *data)
++{
++ struct pt_regs *regs = data;
++
++ switch (action) {
++ default:
++ die_if_kernel("Unhandled kernel unaligned access or invalid "
++ "instruction", regs);
++ /* Fall through */
++
++ case CU2_EXCEPTION:
++ force_sig(SIGILL, current);
++ }
++
++ return NOTIFY_OK;
++}
++
++static struct notifier_block default_cu2_notifier = {
++ .notifier_call = default_cu2_call,
++ .priority = 0x80000000, /* Run last */
++};
++
++asmlinkage void do_cpu(struct pt_regs *regs)
++{
++ unsigned int __user *epc;
++ unsigned long old_epc;
++ unsigned int opcode;
++ unsigned int cpid;
++ int status;
++ unsigned long __maybe_unused flags;
++
++ die_if_kernel("do_cpu invoked from kernel context!", regs);
++
++ cpid = (regs->cp0_cause >> CAUSEB_CE) & 3;
++
++ switch (cpid) {
++ case 0:
++ epc = (unsigned int __user *)exception_epc(regs);
++ old_epc = regs->cp0_epc;
++ opcode = 0;
++ status = -1;
++
++ if (unlikely(compute_return_epc(regs) < 0))
++ return;
++
++ if (unlikely(get_user(opcode, epc) < 0))
++ status = SIGSEGV;
++
++ if (!cpu_has_llsc && status < 0)
++ status = simulate_llsc(regs, opcode);
++
++ if (status < 0)
++ status = simulate_rdhwr(regs, opcode);
++
++ if (status < 0)
++ status = SIGILL;
++
++ if (unlikely(status > 0)) {
++ regs->cp0_epc = old_epc; /* Undo skip-over. */
++ force_sig(status, current);
++ }
++
++ return;
++
++ case 1:
++ if (used_math()) /* Using the FPU again. */
++ own_fpu(1);
++ else { /* First time FPU user. */
++ init_fpu();
++ set_used_math();
++ }
++
++ if (!raw_cpu_has_fpu) {
++ int sig;
++ sig = fpu_emulator_cop1Handler(regs,
++ &current->thread.fpu, 0);
++ if (sig)
++ force_sig(sig, current);
++ else
++ mt_ase_fp_affinity();
++ }
++
++ return;
++
++ case 2:
++ raw_notifier_call_chain(&cu2_chain, CU2_EXCEPTION, regs);
++ return;
++
++ case 3:
++ break;
++ }
++
++ force_sig(SIGILL, current);
++}
++
++asmlinkage void do_mdmx(struct pt_regs *regs)
++{
++ force_sig(SIGILL, current);
++}
++
++/*
++ * Called with interrupts disabled.
++ */
++asmlinkage void do_watch(struct pt_regs *regs)
++{
++ u32 cause;
++
++ /*
++ * Clear WP (bit 22) bit of cause register so we don't loop
++ * forever.
++ */
++ cause = read_c0_cause();
++ cause &= ~(1 << 22);
++ write_c0_cause(cause);
++
++ /*
++ * If the current thread has the watch registers loaded, save
++ * their values and send SIGTRAP. Otherwise another thread
++ * left the registers set, clear them and continue.
++ */
++ if (test_tsk_thread_flag(current, TIF_LOAD_WATCH)) {
++ mips_read_watch_registers();
++ local_irq_enable();
++ force_sig(SIGTRAP, current);
++ } else {
++ mips_clear_watch_registers();
++ local_irq_enable();
++ }
++}
++
++asmlinkage void do_mcheck(struct pt_regs *regs)
++{
++ const int field = 2 * sizeof(unsigned long);
++ int multi_match = regs->cp0_status & ST0_TS;
++
++ show_regs(regs);
++
++ if (multi_match) {
++ printk("Index : %0x\n", read_c0_index());
++ printk("Pagemask: %0x\n", read_c0_pagemask());
++ printk("EntryHi : %0*lx\n", field, read_c0_entryhi());
++ printk("EntryLo0: %0*lx\n", field, read_c0_entrylo0());
++ printk("EntryLo1: %0*lx\n", field, read_c0_entrylo1());
++ printk("\n");
++ dump_tlb_all();
++ }
++
++ show_code((unsigned int __user *) regs->cp0_epc);
++
++ /*
++ * Some chips may have other causes of machine check (e.g. SB1
++ * graduation timer)
++ */
++ panic("Caught Machine Check exception - %scaused by multiple "
++ "matching entries in the TLB.",
++ (multi_match) ? "" : "not ");
++}
++
++asmlinkage void do_mt(struct pt_regs *regs)
++{
++ int subcode;
++
++ subcode = (read_vpe_c0_vpecontrol() & VPECONTROL_EXCPT)
++ >> VPECONTROL_EXCPT_SHIFT;
++ switch (subcode) {
++ case 0:
++ printk(KERN_DEBUG "Thread Underflow\n");
++ break;
++ case 1:
++ printk(KERN_DEBUG "Thread Overflow\n");
++ break;
++ case 2:
++ printk(KERN_DEBUG "Invalid YIELD Qualifier\n");
++ break;
++ case 3:
++ printk(KERN_DEBUG "Gating Storage Exception\n");
++ break;
++ case 4:
++ printk(KERN_DEBUG "YIELD Scheduler Exception\n");
++ break;
++ case 5:
++ printk(KERN_DEBUG "Gating Storage Schedulier Exception\n");
++ break;
++ default:
++ printk(KERN_DEBUG "*** UNKNOWN THREAD EXCEPTION %d ***\n",
++ subcode);
++ break;
++ }
++ die_if_kernel("MIPS MT Thread exception in kernel", regs);
++
++ force_sig(SIGILL, current);
++}
++
++
++asmlinkage void do_dsp(struct pt_regs *regs)
++{
++ if (cpu_has_dsp)
++ panic("Unexpected DSP exception\n");
++
++ force_sig(SIGILL, current);
++}
++
++asmlinkage void do_reserved(struct pt_regs *regs)
++{
++ /*
++ * Game over - no way to handle this if it ever occurs. Most probably
++ * caused by a new unknown cpu type or after another deadly
++ * hard/software error.
++ */
++ show_regs(regs);
++ panic("Caught reserved exception %ld - should not happen.",
++ (regs->cp0_cause & 0x7f) >> 2);
++}
++
++static int __initdata l1parity = 1;
++static int __init nol1parity(char *s)
++{
++ l1parity = 0;
++ return 1;
++}
++__setup("nol1par", nol1parity);
++static int __initdata l2parity = 1;
++static int __init nol2parity(char *s)
++{
++ l2parity = 0;
++ return 1;
++}
++__setup("nol2par", nol2parity);
++
++/*
++ * Some MIPS CPUs can enable/disable for cache parity detection, but do
++ * it different ways.
++ */
++static inline void parity_protection_init(void)
++{
++ switch (current_cpu_type()) {
++ case CPU_24K:
++ case CPU_34K:
++ case CPU_74K:
++ case CPU_1004K:
++ {
++#define ERRCTL_PE 0x80000000
++#define ERRCTL_L2P 0x00800000
++ unsigned long errctl;
++ unsigned int l1parity_present, l2parity_present;
++
++ errctl = read_c0_ecc();
++ errctl &= ~(ERRCTL_PE|ERRCTL_L2P);
++
++ /* probe L1 parity support */
++ write_c0_ecc(errctl | ERRCTL_PE);
++ back_to_back_c0_hazard();
++ l1parity_present = (read_c0_ecc() & ERRCTL_PE);
++
++ /* probe L2 parity support */
++ write_c0_ecc(errctl|ERRCTL_L2P);
++ back_to_back_c0_hazard();
++ l2parity_present = (read_c0_ecc() & ERRCTL_L2P);
++
++ if (l1parity_present && l2parity_present) {
++ if (l1parity)
++ errctl |= ERRCTL_PE;
++ if (l1parity ^ l2parity)
++ errctl |= ERRCTL_L2P;
++ } else if (l1parity_present) {
++ if (l1parity)
++ errctl |= ERRCTL_PE;
++ } else if (l2parity_present) {
++ if (l2parity)
++ errctl |= ERRCTL_L2P;
++ } else {
++ /* No parity available */
++ }
++
++ printk(KERN_INFO "Writing ErrCtl register=%08lx\n", errctl);
++
++ write_c0_ecc(errctl);
++ back_to_back_c0_hazard();
++ errctl = read_c0_ecc();
++ printk(KERN_INFO "Readback ErrCtl register=%08lx\n", errctl);
++
++ if (l1parity_present)
++ printk(KERN_INFO "Cache parity protection %sabled\n",
++ (errctl & ERRCTL_PE) ? "en" : "dis");
++
++ if (l2parity_present) {
++ if (l1parity_present && l1parity)
++ errctl ^= ERRCTL_L2P;
++ printk(KERN_INFO "L2 cache parity protection %sabled\n",
++ (errctl & ERRCTL_L2P) ? "en" : "dis");
++ }
++ }
++ break;
++
++ case CPU_5KC:
++ write_c0_ecc(0x80000000);
++ back_to_back_c0_hazard();
++ /* Set the PE bit (bit 31) in the c0_errctl register. */
++ printk(KERN_INFO "Cache parity protection %sabled\n",
++ (read_c0_ecc() & 0x80000000) ? "en" : "dis");
++ break;
++ case CPU_20KC:
++ case CPU_25KF:
++ /* Clear the DE bit (bit 16) in the c0_status register. */
++ printk(KERN_INFO "Enable cache parity protection for "
++ "MIPS 20KC/25KF CPUs.\n");
++ clear_c0_status(ST0_DE);
++ break;
++ default:
++ break;
++ }
++}
++
++asmlinkage void cache_parity_error(void)
++{
++ const int field = 2 * sizeof(unsigned long);
++ unsigned int reg_val;
++
++ /* For the moment, report the problem and hang. */
++ printk("Cache error exception:\n");
++ printk("cp0_errorepc == %0*lx\n", field, read_c0_errorepc());
++ reg_val = read_c0_cacheerr();
++ printk("c0_cacheerr == %08x\n", reg_val);
++
++ printk("Decoded c0_cacheerr: %s cache fault in %s reference.\n",
++ reg_val & (1<<30) ? "secondary" : "primary",
++ reg_val & (1<<31) ? "data" : "insn");
++ printk("Error bits: %s%s%s%s%s%s%s\n",
++ reg_val & (1<<29) ? "ED " : "",
++ reg_val & (1<<28) ? "ET " : "",
++ reg_val & (1<<26) ? "EE " : "",
++ reg_val & (1<<25) ? "EB " : "",
++ reg_val & (1<<24) ? "EI " : "",
++ reg_val & (1<<23) ? "E1 " : "",
++ reg_val & (1<<22) ? "E0 " : "");
++ printk("IDX: 0x%08x\n", reg_val & ((1<<22)-1));
++
++#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
++ if (reg_val & (1<<22))
++ printk("DErrAddr0: 0x%0*lx\n", field, read_c0_derraddr0());
++
++ if (reg_val & (1<<23))
++ printk("DErrAddr1: 0x%0*lx\n", field, read_c0_derraddr1());
++#endif
++
++ panic("Can't handle the cache error!");
++}
++
++/*
++ * SDBBP EJTAG debug exception handler.
++ * We skip the instruction and return to the next instruction.
++ */
++void ejtag_exception_handler(struct pt_regs *regs)
++{
++ const int field = 2 * sizeof(unsigned long);
++ unsigned long depc, old_epc;
++ unsigned int debug;
++
++ printk(KERN_DEBUG "SDBBP EJTAG debug exception - not handled yet, just ignored!\n");
++ depc = read_c0_depc();
++ debug = read_c0_debug();
++ printk(KERN_DEBUG "c0_depc = %0*lx, DEBUG = %08x\n", field, depc, debug);
++ if (debug & 0x80000000) {
++ /*
++ * In branch delay slot.
++ * We cheat a little bit here and use EPC to calculate the
++ * debug return address (DEPC). EPC is restored after the
++ * calculation.
++ */
++ old_epc = regs->cp0_epc;
++ regs->cp0_epc = depc;
++ __compute_return_epc(regs);
++ depc = regs->cp0_epc;
++ regs->cp0_epc = old_epc;
++ } else
++ depc += 4;
++ write_c0_depc(depc);
++
++#if 0
++ printk(KERN_DEBUG "\n\n----- Enable EJTAG single stepping ----\n\n");
++ write_c0_debug(debug | 0x100);
++#endif
++}
++
++/*
++ * NMI exception handler.
++ */
++NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
++{
++ bust_spinlocks(1);
++ printk("NMI taken!!!!\n");
++ die("NMI", regs);
++}
++
++#define VECTORSPACING 0x100 /* for EI/VI mode */
++
++unsigned long ebase;
++unsigned long exception_handlers[32];
++unsigned long vi_handlers[64];
++
++void __init *set_except_vector(int n, void *addr)
++{
++ unsigned long handler = (unsigned long) addr;
++ unsigned long old_handler = exception_handlers[n];
++
++ exception_handlers[n] = handler;
++ if (n == 0 && cpu_has_divec) {
++ unsigned long jump_mask = ~((1 << 28) - 1);
++ u32 *buf = (u32 *)(ebase + 0x200);
++ unsigned int k0 = 26;
++ if ((handler & jump_mask) == ((ebase + 0x200) & jump_mask)) {
++ uasm_i_j(&buf, handler & ~jump_mask);
++ uasm_i_nop(&buf);
++ } else {
++ UASM_i_LA(&buf, k0, handler);
++ uasm_i_jr(&buf, k0);
++ uasm_i_nop(&buf);
++ }
++ local_flush_icache_range(ebase + 0x200, (unsigned long)buf);
++ }
++ return (void *)old_handler;
++}
++
++static asmlinkage void do_default_vi(void)
++{
++ show_regs(get_irq_regs());
++ panic("Caught unexpected vectored interrupt.");
++}
++
++static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)
++{
++ unsigned long handler;
++ unsigned long old_handler = vi_handlers[n];
++ int srssets = current_cpu_data.srsets;
++ u32 *w;
++ unsigned char *b;
++
++ BUG_ON(!cpu_has_veic && !cpu_has_vint);
++
++ if (addr == NULL) {
++ handler = (unsigned long) do_default_vi;
++ srs = 0;
++ } else
++ handler = (unsigned long) addr;
++ vi_handlers[n] = (unsigned long) addr;
++
++ b = (unsigned char *)(ebase + 0x200 + n*VECTORSPACING);
++
++ if (srs >= srssets)
++ panic("Shadow register set %d not supported", srs);
++
++ if (cpu_has_veic) {
++ if (board_bind_eic_interrupt)
++ board_bind_eic_interrupt(n, srs);
++ } else if (cpu_has_vint) {
++ /* SRSMap is only defined if shadow sets are implemented */
++ if (srssets > 1)
++ change_c0_srsmap(0xf << n*4, srs << n*4);
++ }
++
++ if (srs == 0) {
++ /*
++ * If no shadow set is selected then use the default handler
++ * that does normal register saving and a standard interrupt exit
++ */
++
++ extern char except_vec_vi, except_vec_vi_lui;
++ extern char except_vec_vi_ori, except_vec_vi_end;
++ extern char rollback_except_vec_vi;
++ char *vec_start = (cpu_wait == r4k_wait) ?
++ &rollback_except_vec_vi : &except_vec_vi;
++#ifdef CONFIG_MIPS_MT_SMTC
++ /*
++ * We need to provide the SMTC vectored interrupt handler
++ * not only with the address of the handler, but with the
++ * Status.IM bit to be masked before going there.
++ */
++ extern char except_vec_vi_mori;
++ const int mori_offset = &except_vec_vi_mori - vec_start;
++#endif /* CONFIG_MIPS_MT_SMTC */
++ const int handler_len = &except_vec_vi_end - vec_start;
++ const int lui_offset = &except_vec_vi_lui - vec_start;
++ const int ori_offset = &except_vec_vi_ori - vec_start;
++
++ if (handler_len > VECTORSPACING) {
++ /*
++ * Sigh... panicing won't help as the console
++ * is probably not configured :(
++ */
++ panic("VECTORSPACING too small");
++ }
++
++ memcpy(b, vec_start, handler_len);
++#ifdef CONFIG_MIPS_MT_SMTC
++ BUG_ON(n > 7); /* Vector index %d exceeds SMTC maximum. */
++
++ w = (u32 *)(b + mori_offset);
++ *w = (*w & 0xffff0000) | (0x100 << n);
++#endif /* CONFIG_MIPS_MT_SMTC */
++ w = (u32 *)(b + lui_offset);
++ *w = (*w & 0xffff0000) | (((u32)handler >> 16) & 0xffff);
++ w = (u32 *)(b + ori_offset);
++ *w = (*w & 0xffff0000) | ((u32)handler & 0xffff);
++ local_flush_icache_range((unsigned long)b,
++ (unsigned long)(b+handler_len));
++ }
++ else {
++ /*
++ * In other cases jump directly to the interrupt handler
++ *
++ * It is the handlers responsibility to save registers if required
++ * (eg hi/lo) and return from the exception using "eret"
++ */
++ w = (u32 *)b;
++ *w++ = 0x08000000 | (((u32)handler >> 2) & 0x03fffff); /* j handler */
++ *w = 0;
++ local_flush_icache_range((unsigned long)b,
++ (unsigned long)(b+8));
++ }
++
++ return (void *)old_handler;
++}
++
++void *set_vi_handler(int n, vi_handler_t addr)
++{
++ return set_vi_srs_handler(n, addr, 0);
++}
++
++extern void cpu_cache_init(void);
++extern void tlb_init(void);
++extern void flush_tlb_handlers(void);
++
++/*
++ * Timer interrupt
++ */
++int cp0_compare_irq;
++int cp0_compare_irq_shift;
++
++/*
++ * Performance counter IRQ or -1 if shared with timer
++ */
++int cp0_perfcount_irq;
++EXPORT_SYMBOL_GPL(cp0_perfcount_irq);
++
++static int __cpuinitdata noulri;
++
++static int __init ulri_disable(char *s)
++{
++ pr_info("Disabling ulri\n");
++ noulri = 1;
++
++ return 1;
++}
++__setup("noulri", ulri_disable);
++
++void __cpuinit per_cpu_trap_init(void)
++{
++ unsigned int cpu = smp_processor_id();
++ unsigned int status_set = ST0_CU0;
++#ifdef CONFIG_MIPS_MT_SMTC
++ int secondaryTC = 0;
++ int bootTC = (cpu == 0);
++
++ /*
++ * Only do per_cpu_trap_init() for first TC of Each VPE.
++ * Note that this hack assumes that the SMTC init code
++ * assigns TCs consecutively and in ascending order.
++ */
++
++ if (((read_c0_tcbind() & TCBIND_CURTC) != 0) &&
++ ((read_c0_tcbind() & TCBIND_CURVPE) == cpu_data[cpu - 1].vpe_id))
++ secondaryTC = 1;
++#endif /* CONFIG_MIPS_MT_SMTC */
++
++ /*
++ * Disable coprocessors and select 32-bit or 64-bit addressing
++ * and the 16/32 or 32/32 FPR register model. Reset the BEV
++ * flag that some firmware may have left set and the TS bit (for
++ * IP27). Set XX for ISA IV code to work.
++ */
++#ifdef CONFIG_64BIT
++ status_set |= ST0_FR|ST0_KX|ST0_SX|ST0_UX;
++#endif
++ if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV)
++ status_set |= ST0_XX;
++ if (cpu_has_dsp)
++ status_set |= ST0_MX;
++
++ change_c0_status(ST0_CU|ST0_MX|ST0_RE|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,
++ status_set);
++
++ if (cpu_has_mips_r2) {
++ unsigned int enable = 0x0000000f | cpu_hwrena_impl_bits;
++
++ if (!noulri && cpu_has_userlocal)
++ enable |= (1 << 29);
++
++ write_c0_hwrena(enable);
++ }
++
++#ifdef CONFIG_MIPS_MT_SMTC
++ if (!secondaryTC) {
++#endif /* CONFIG_MIPS_MT_SMTC */
++
++ if (cpu_has_veic || cpu_has_vint) {
++ unsigned long sr = set_c0_status(ST0_BEV);
++ write_c0_ebase(ebase);
++ write_c0_status(sr);
++ /* Setting vector spacing enables EI/VI mode */
++ change_c0_intctl(0x3e0, VECTORSPACING);
++ }
++ if (cpu_has_divec) {
++ if (cpu_has_mipsmt) {
++ unsigned int vpflags = dvpe();
++ set_c0_cause(CAUSEF_IV);
++ evpe(vpflags);
++ } else
++ set_c0_cause(CAUSEF_IV);
++ }
++
++ /*
++ * Before R2 both interrupt numbers were fixed to 7, so on R2 only:
++ *
++ * o read IntCtl.IPTI to determine the timer interrupt
++ * o read IntCtl.IPPCI to determine the performance counter interrupt
++ */
++ if (cpu_has_mips_r2) {
++ cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
++ cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
++ cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
++ if (cp0_perfcount_irq == cp0_compare_irq)
++ cp0_perfcount_irq = -1;
++ } else {
++ cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
++ cp0_compare_irq_shift = cp0_compare_irq;
++ cp0_perfcount_irq = -1;
++ }
++
++#ifdef CONFIG_MIPS_MT_SMTC
++ }
++#endif /* CONFIG_MIPS_MT_SMTC */
++
++ cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
++ TLBMISS_HANDLER_SETUP();
++
++ atomic_inc(&init_mm.mm_count);
++ current->active_mm = &init_mm;
++ BUG_ON(current->mm);
++ enter_lazy_tlb(&init_mm, current);
++
++#ifdef CONFIG_MIPS_MT_SMTC
++ if (bootTC) {
++#endif /* CONFIG_MIPS_MT_SMTC */
++ cpu_cache_init();
++ tlb_init();
++#ifdef CONFIG_MIPS_MT_SMTC
++ } else if (!secondaryTC) {
++ /*
++ * First TC in non-boot VPE must do subset of tlb_init()
++ * for MMU countrol registers.
++ */
++ write_c0_pagemask(PM_DEFAULT_MASK);
++ write_c0_wired(0);
++ }
++#endif /* CONFIG_MIPS_MT_SMTC */
++}
++
++/* Install CPU exception handler */
++void __init set_handler(unsigned long offset, void *addr, unsigned long size)
++{
++ memcpy((void *)(ebase + offset), addr, size);
++ local_flush_icache_range(ebase + offset, ebase + offset + size);
++}
++
++static char panic_null_cerr[] __cpuinitdata =
++ "Trying to set NULL cache error exception handler";
++
++/*
++ * Install uncached CPU exception handler.
++ * This is suitable only for the cache error exception which is the only
++ * exception handler that is being run uncached.
++ */
++void __cpuinit set_uncached_handler(unsigned long offset, void *addr,
++ unsigned long size)
++{
++ unsigned long uncached_ebase = CKSEG1ADDR(ebase);
++
++ if (!addr)
++ panic(panic_null_cerr);
++
++ memcpy((void *)(uncached_ebase + offset), addr, size);
++}
++
++static int __initdata rdhwr_noopt;
++static int __init set_rdhwr_noopt(char *str)
++{
++ rdhwr_noopt = 1;
++ return 1;
++}
++
++__setup("rdhwr_noopt", set_rdhwr_noopt);
++
++void __init trap_init(void)
++{
++ extern char except_vec3_generic, except_vec3_r4000;
++ extern char except_vec4;
++ unsigned long i;
++ int rollback;
++
++ check_wait();
++ rollback = (cpu_wait == r4k_wait);
++
++#if defined(CONFIG_KGDB)
++ if (kgdb_early_setup)
++ return; /* Already done */
++#endif
++
++ if (cpu_has_veic || cpu_has_vint) {
++ unsigned long size = 0x200 + VECTORSPACING*64;
++ ebase = (unsigned long)
++ __alloc_bootmem(size, 1 << fls(size), 0);
++ } else {
++ ebase = CKSEG0;
++ if (cpu_has_mips_r2)
++ ebase += (read_c0_ebase() & 0x3ffff000);
++ }
++
++ per_cpu_trap_init();
++
++ /*
++ * Copy the generic exception handlers to their final destination.
++ * This will be overriden later as suitable for a particular
++ * configuration.
++ */
++ set_handler(0x180, &except_vec3_generic, 0x80);
++
++ /*
++ * Setup default vectors
++ */
++ for (i = 0; i <= 31; i++)
++ set_except_vector(i, handle_reserved);
++
++ /*
++ * Copy the EJTAG debug exception vector handler code to it's final
++ * destination.
++ */
++ if (cpu_has_ejtag && board_ejtag_handler_setup)
++ board_ejtag_handler_setup();
++
++ /*
++ * Only some CPUs have the watch exceptions.
++ */
++ if (cpu_has_watch)
++ set_except_vector(23, handle_watch);
++
++ /*
++ * Initialise interrupt handlers
++ */
++ if (cpu_has_veic || cpu_has_vint) {
++ int nvec = cpu_has_veic ? 64 : 8;
++ for (i = 0; i < nvec; i++)
++ set_vi_handler(i, NULL);
++ }
++ else if (cpu_has_divec)
++ set_handler(0x200, &except_vec4, 0x8);
++
++ /*
++ * Some CPUs can enable/disable for cache parity detection, but does
++ * it different ways.
++ */
++ parity_protection_init();
++
++ /*
++ * The Data Bus Errors / Instruction Bus Errors are signaled
++ * by external hardware. Therefore these two exceptions
++ * may have board specific handlers.
++ */
++ if (board_be_init)
++ board_be_init();
++
++ set_except_vector(0, rollback ? rollback_handle_int : handle_int);
++ set_except_vector(1, handle_tlbm);
++ set_except_vector(2, handle_tlbl);
++ set_except_vector(3, handle_tlbs);
++
++ set_except_vector(4, handle_adel);
++ set_except_vector(5, handle_ades);
++
++ set_except_vector(6, handle_ibe);
++ set_except_vector(7, handle_dbe);
++
++ set_except_vector(8, handle_sys);
++ set_except_vector(9, handle_bp);
++ set_except_vector(10, rdhwr_noopt ? handle_ri :
++ (cpu_has_vtag_icache ?
++ handle_ri_rdhwr_vivt : handle_ri_rdhwr));
++ set_except_vector(11, handle_cpu);
++ set_except_vector(12, handle_ov);
++ set_except_vector(13, handle_tr);
++
++ if (current_cpu_type() == CPU_R6000 ||
++ current_cpu_type() == CPU_R6000A) {
++ /*
++ * The R6000 is the only R-series CPU that features a machine
++ * check exception (similar to the R4000 cache error) and
++ * unaligned ldc1/sdc1 exception. The handlers have not been
++ * written yet. Well, anyway there is no R6000 machine on the
++ * current list of targets for Linux/MIPS.
++ * (Duh, crap, there is someone with a triple R6k machine)
++ */
++ //set_except_vector(14, handle_mc);
++ //set_except_vector(15, handle_ndc);
++ }
++
++
++ if (board_nmi_handler_setup)
++ board_nmi_handler_setup();
++
++ if (cpu_has_fpu && !cpu_has_nofpuex)
++ set_except_vector(15, handle_fpe);
++
++ set_except_vector(22, handle_mdmx);
++
++ if (cpu_has_mcheck)
++ set_except_vector(24, handle_mcheck);
++
++ if (cpu_has_mipsmt)
++ set_except_vector(25, handle_mt);
++
++ set_except_vector(26, handle_dsp);
++
++ if (cpu_has_vce)
++ /* Special exception: R4[04]00 uses also the divec space. */
++ memcpy((void *)(ebase + 0x180), &except_vec3_r4000, 0x100);
++ else if (cpu_has_4kex)
++ memcpy((void *)(ebase + 0x180), &except_vec3_generic, 0x80);
++ else
++ memcpy((void *)(ebase + 0x080), &except_vec3_generic, 0x80);
++
++ local_flush_icache_range(ebase, ebase + 0x400);
++ flush_tlb_handlers();
++
++ sort_extable(__start___dbe_table, __stop___dbe_table);
++
++ register_cu2_notifier(&default_cu2_notifier);
++}
+diff -Nur linux-2.6.35.7.orig/arch/mips/Makefile linux-2.6.35.7/arch/mips/Makefile
+--- linux-2.6.35.7.orig/arch/mips/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/mips/Makefile 2010-10-14 20:27:59.685601082 +0200
@@ -179,6 +179,13 @@
cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
endif
@@ -9321,9 +11063,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/Makefile linux-2.6.34/arch/mips/Makefile
cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,)
cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,)
cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,)
-diff -Nur linux-2.6.34.orig/arch/mips/pci/Makefile linux-2.6.34/arch/mips/pci/Makefile
---- linux-2.6.34.orig/arch/mips/pci/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/mips/pci/Makefile 2010-05-25 18:46:08.712416500 +0200
+diff -Nur linux-2.6.35.7.orig/arch/mips/pci/Makefile linux-2.6.35.7/arch/mips/pci/Makefile
+--- linux-2.6.35.7.orig/arch/mips/pci/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/mips/pci/Makefile 2010-10-14 20:27:59.718092160 +0200
@@ -18,6 +18,7 @@
obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o
obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o fixup-bcm63xx.o \
@@ -9332,9 +11074,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/pci/Makefile linux-2.6.34/arch/mips/pci/Ma
#
# These are still pretty much in the old state, watch, go blind.
-diff -Nur linux-2.6.34.orig/arch/mips/pci/pci-ar71xx.c linux-2.6.34/arch/mips/pci/pci-ar71xx.c
---- linux-2.6.34.orig/arch/mips/pci/pci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/arch/mips/pci/pci-ar71xx.c 2010-05-25 18:46:08.752223161 +0200
+diff -Nur linux-2.6.35.7.orig/arch/mips/pci/pci-ar71xx.c linux-2.6.35.7/arch/mips/pci/pci-ar71xx.c
+--- linux-2.6.35.7.orig/arch/mips/pci/pci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/pci/pci-ar71xx.c 2010-10-14 20:27:59.758101117 +0200
@@ -0,0 +1,409 @@
+/*
+ * Atheros AR71xx PCI host controller driver
@@ -9745,9 +11487,9 @@ diff -Nur linux-2.6.34.orig/arch/mips/pci/pci-ar71xx.c linux-2.6.34/arch/mips/pc
+
+ return 0;
+}
-diff -Nur linux-2.6.34.orig/arch/mips/pci/pci-ar724x.c linux-2.6.34/arch/mips/pci/pci-ar724x.c
---- linux-2.6.34.orig/arch/mips/pci/pci-ar724x.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/arch/mips/pci/pci-ar724x.c 2010-05-25 18:46:08.793464075 +0200
+diff -Nur linux-2.6.35.7.orig/arch/mips/pci/pci-ar724x.c linux-2.6.35.7/arch/mips/pci/pci-ar724x.c
+--- linux-2.6.35.7.orig/arch/mips/pci/pci-ar724x.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/arch/mips/pci/pci-ar724x.c 2010-10-14 20:27:59.798101290 +0200
@@ -0,0 +1,395 @@
+/*
+ * Atheros AR724x PCI host controller driver
@@ -10144,10 +11886,10 @@ diff -Nur linux-2.6.34.orig/arch/mips/pci/pci-ar724x.c linux-2.6.34/arch/mips/pc
+ err:
+ return ret;
+}
-diff -Nur linux-2.6.34.orig/drivers/char/Kconfig linux-2.6.34/drivers/char/Kconfig
---- linux-2.6.34.orig/drivers/char/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/char/Kconfig 2010-05-25 18:46:08.833464040 +0200
-@@ -1024,6 +1024,14 @@
+diff -Nur linux-2.6.35.7.orig/drivers/char/Kconfig linux-2.6.35.7/drivers/char/Kconfig
+--- linux-2.6.35.7.orig/drivers/char/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/char/Kconfig 2010-10-14 20:27:59.828101117 +0200
+@@ -1032,6 +1032,14 @@
If compiled as a module, it will be called cs5535_gpio.
@@ -10162,10 +11904,1147 @@ diff -Nur linux-2.6.34.orig/drivers/char/Kconfig linux-2.6.34/drivers/char/Kconf
config RAW_DRIVER
tristate "RAW driver (/dev/raw/rawN)"
depends on BLOCK
-diff -Nur linux-2.6.34.orig/drivers/char/Makefile linux-2.6.34/drivers/char/Makefile
---- linux-2.6.34.orig/drivers/char/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/char/Makefile 2010-05-25 18:46:08.873463967 +0200
-@@ -95,6 +95,7 @@
+diff -Nur linux-2.6.35.7.orig/drivers/char/Kconfig.orig linux-2.6.35.7/drivers/char/Kconfig.orig
+--- linux-2.6.35.7.orig/drivers/char/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/char/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,1133 @@
++#
++# Character device configuration
++#
++
++menu "Character devices"
++
++config VT
++ bool "Virtual terminal" if EMBEDDED
++ depends on !S390
++ select INPUT
++ default y
++ ---help---
++ If you say Y here, you will get support for terminal devices with
++ display and keyboard devices. These are called "virtual" because you
++ can run several virtual terminals (also called virtual consoles) on
++ one physical terminal. This is rather useful, for example one
++ virtual terminal can collect system messages and warnings, another
++ one can be used for a text-mode user session, and a third could run
++ an X session, all in parallel. Switching between virtual terminals
++ is done with certain key combinations, usually Alt-<function key>.
++
++ The setterm command ("man setterm") can be used to change the
++ properties (such as colors or beeping) of a virtual terminal. The
++ man page console_codes(4) ("man console_codes") contains the special
++ character sequences that can be used to change those properties
++ directly. The fonts used on virtual terminals can be changed with
++ the setfont ("man setfont") command and the key bindings are defined
++ with the loadkeys ("man loadkeys") command.
++
++ You need at least one virtual terminal device in order to make use
++ of your keyboard and monitor. Therefore, only people configuring an
++ embedded system would want to say N here in order to save some
++ memory; the only way to log into such a system is then via a serial
++ or network connection.
++
++ If unsure, say Y, or else you won't be able to do much with your new
++ shiny Linux system :-)
++
++config CONSOLE_TRANSLATIONS
++ depends on VT
++ default y
++ bool "Enable character translations in console" if EMBEDDED
++ ---help---
++ This enables support for font mapping and Unicode translation
++ on virtual consoles.
++
++config VT_CONSOLE
++ bool "Support for console on virtual terminal" if EMBEDDED
++ depends on VT
++ default y
++ ---help---
++ The system console is the device which receives all kernel messages
++ and warnings and which allows logins in single user mode. If you
++ answer Y here, a virtual terminal (the device used to interact with
++ a physical terminal) can be used as system console. This is the most
++ common mode of operations, so you should say Y here unless you want
++ the kernel messages be output only to a serial port (in which case
++ you should say Y to "Console on serial port", below).
++
++ If you do say Y here, by default the currently visible virtual
++ terminal (/dev/tty0) will be used as system console. You can change
++ that with a kernel command line option such as "console=tty3" which
++ would use the third virtual terminal as system console. (Try "man
++ bootparam" or see the documentation of your boot loader (lilo or
++ loadlin) about how to pass options to the kernel at boot time.)
++
++ If unsure, say Y.
++
++config HW_CONSOLE
++ bool
++ depends on VT && !S390 && !UML
++ default y
++
++config VT_HW_CONSOLE_BINDING
++ bool "Support for binding and unbinding console drivers"
++ depends on HW_CONSOLE
++ default n
++ ---help---
++ The virtual terminal is the device that interacts with the physical
++ terminal through console drivers. On these systems, at least one
++ console driver is loaded. In other configurations, additional console
++ drivers may be enabled, such as the framebuffer console. If more than
++ 1 console driver is enabled, setting this to 'y' will allow you to
++ select the console driver that will serve as the backend for the
++ virtual terminals.
++
++ See <file:Documentation/console/console.txt> for more
++ information. For framebuffer console users, please refer to
++ <file:Documentation/fb/fbcon.txt>.
++
++config DEVKMEM
++ bool "/dev/kmem virtual device support"
++ default y
++ help
++ Say Y here if you want to support the /dev/kmem device. The
++ /dev/kmem device is rarely used, but can be used for certain
++ kind of kernel debugging operations.
++ When in doubt, say "N".
++
++config BFIN_JTAG_COMM
++ tristate "Blackfin JTAG Communication"
++ depends on BLACKFIN
++ help
++ Add support for emulating a TTY device over the Blackfin JTAG.
++
++ To compile this driver as a module, choose M here: the
++ module will be called bfin_jtag_comm.
++
++config BFIN_JTAG_COMM_CONSOLE
++ bool "Console on Blackfin JTAG"
++ depends on BFIN_JTAG_COMM=y
++
++config SERIAL_NONSTANDARD
++ bool "Non-standard serial port support"
++ depends on HAS_IOMEM
++ ---help---
++ Say Y here if you have any non-standard serial boards -- boards
++ which aren't supported using the standard "dumb" serial driver.
++ This includes intelligent serial boards such as Cyclades,
++ Digiboards, etc. These are usually used for systems that need many
++ serial ports because they serve many terminals or dial-in
++ connections.
++
++ Note that the answer to this question won't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the questions about non-standard serial boards.
++
++ Most people can say N here.
++
++config COMPUTONE
++ tristate "Computone IntelliPort Plus serial support"
++ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
++ ---help---
++ This driver supports the entire family of Intelliport II/Plus
++ controllers with the exception of the MicroChannel controllers and
++ products previous to the Intelliport II. These are multiport cards,
++ which give you many serial ports. You would need something like this
++ to connect more than two modems to your Linux box, for instance in
++ order to become a dial-in server. If you have a card like that, say
++ Y here and read <file:Documentation/serial/computone.txt>.
++
++ To compile this driver as module, choose M here: the
++ module will be called ip2.
++
++config ROCKETPORT
++ tristate "Comtrol RocketPort support"
++ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
++ help
++ This driver supports Comtrol RocketPort and RocketModem PCI boards.
++ These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
++ modems. For information about the RocketPort/RocketModem boards
++ and this driver read <file:Documentation/serial/rocket.txt>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called rocket.
++
++ If you want to compile this driver into the kernel, say Y here. If
++ you don't have a Comtrol RocketPort/RocketModem card installed, say N.
++
++config CYCLADES
++ tristate "Cyclades async mux support"
++ depends on SERIAL_NONSTANDARD && (PCI || ISA)
++ select FW_LOADER
++ ---help---
++ This driver supports Cyclades Z and Y multiserial boards.
++ You would need something like this to connect more than two modems to
++ your Linux box, for instance in order to become a dial-in server.
++
++ For information about the Cyclades-Z card, read
++ <file:Documentation/serial/README.cycladesZ>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called cyclades.
++
++ If you haven't heard about it, it's safe to say N.
++
++config CYZ_INTR
++ bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
++ depends on EXPERIMENTAL && CYCLADES
++ help
++ The Cyclades-Z family of multiport cards allows 2 (two) driver op
++ modes: polling and interrupt. In polling mode, the driver will check
++ the status of the Cyclades-Z ports every certain amount of time
++ (which is called polling cycle and is configurable). In interrupt
++ mode, it will use an interrupt line (IRQ) in order to check the
++ status of the Cyclades-Z ports. The default op mode is polling. If
++ unsure, say N.
++
++config DIGIEPCA
++ tristate "Digiboard Intelligent Async Support"
++ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
++ ---help---
++ This is a driver for Digi International's Xx, Xeve, and Xem series
++ of cards which provide multiple serial ports. You would need
++ something like this to connect more than two modems to your Linux
++ box, for instance in order to become a dial-in server. This driver
++ supports the original PC (ISA) boards as well as PCI, and EISA. If
++ you have a card like this, say Y here and read the file
++ <file:Documentation/serial/digiepca.txt>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called epca.
++
++config MOXA_INTELLIO
++ tristate "Moxa Intellio support"
++ depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
++ select FW_LOADER
++ help
++ Say Y here if you have a Moxa Intellio multiport serial card.
++
++ To compile this driver as a module, choose M here: the
++ module will be called moxa.
++
++config MOXA_SMARTIO
++ tristate "Moxa SmartIO support v. 2.0"
++ depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
++ help
++ Say Y here if you have a Moxa SmartIO multiport serial card and/or
++ want to help develop a new version of this driver.
++
++ This is upgraded (1.9.1) driver from original Moxa drivers with
++ changes finally resulting in PCI probing.
++
++ This driver can also be built as a module. The module will be called
++ mxser. If you want to do that, say M here.
++
++config ISI
++ tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
++ depends on SERIAL_NONSTANDARD && PCI
++ select FW_LOADER
++ help
++ This is a driver for the Multi-Tech cards which provide several
++ serial ports. The driver is experimental and can currently only be
++ built as a module. The module will be called isicom.
++ If you want to do that, choose M here.
++
++config SYNCLINK
++ tristate "Microgate SyncLink card support"
++ depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
++ help
++ Provides support for the SyncLink ISA and PCI multiprotocol serial
++ adapters. These adapters support asynchronous and HDLC bit
++ synchronous communication up to 10Mbps (PCI adapter).
++
++ This driver can only be built as a module ( = code which can be
++ inserted in and removed from the running kernel whenever you want).
++ The module will be called synclink. If you want to do that, say M
++ here.
++
++config SYNCLINKMP
++ tristate "SyncLink Multiport support"
++ depends on SERIAL_NONSTANDARD && PCI
++ help
++ Enable support for the SyncLink Multiport (2 or 4 ports)
++ serial adapter, running asynchronous and HDLC communications up
++ to 2.048Mbps. Each ports is independently selectable for
++ RS-232, V.35, RS-449, RS-530, and X.21
++
++ This driver may be built as a module ( = code which can be
++ inserted in and removed from the running kernel whenever you want).
++ The module will be called synclinkmp. If you want to do that, say M
++ here.
++
++config SYNCLINK_GT
++ tristate "SyncLink GT/AC support"
++ depends on SERIAL_NONSTANDARD && PCI
++ help
++ Support for SyncLink GT and SyncLink AC families of
++ synchronous and asynchronous serial adapters
++ manufactured by Microgate Systems, Ltd. (www.microgate.com)
++
++config N_HDLC
++ tristate "HDLC line discipline support"
++ depends on SERIAL_NONSTANDARD
++ help
++ Allows synchronous HDLC communications with tty device drivers that
++ support synchronous HDLC such as the Microgate SyncLink adapter.
++
++ This driver can be built as a module ( = code which can be
++ inserted in and removed from the running kernel whenever you want).
++ The module will be called n_hdlc. If you want to do that, say M
++ here.
++
++config N_GSM
++ tristate "GSM MUX line discipline support (EXPERIMENTAL)"
++ depends on EXPERIMENTAL
++ depends on NET
++ help
++ This line discipline provides support for the GSM MUX protocol and
++ presents the mux as a set of 61 individual tty devices.
++
++config RISCOM8
++ tristate "SDL RISCom/8 card support"
++ depends on SERIAL_NONSTANDARD
++ help
++ This is a driver for the SDL Communications RISCom/8 multiport card,
++ which gives you many serial ports. You would need something like
++ this to connect more than two modems to your Linux box, for instance
++ in order to become a dial-in server. If you have a card like that,
++ say Y here and read the file <file:Documentation/serial/riscom8.txt>.
++
++ Also it's possible to say M here and compile this driver as kernel
++ loadable module; the module will be called riscom8.
++
++config SPECIALIX
++ tristate "Specialix IO8+ card support"
++ depends on SERIAL_NONSTANDARD
++ help
++ This is a driver for the Specialix IO8+ multiport card (both the
++ ISA and the PCI version) which gives you many serial ports. You
++ would need something like this to connect more than two modems to
++ your Linux box, for instance in order to become a dial-in server.
++
++ If you have a card like that, say Y here and read the file
++ <file:Documentation/serial/specialix.txt>. Also it's possible to say
++ M here and compile this driver as kernel loadable module which will be
++ called specialix.
++
++config SX
++ tristate "Specialix SX (and SI) card support"
++ depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
++ help
++ This is a driver for the SX and SI multiport serial cards.
++ Please read the file <file:Documentation/serial/sx.txt> for details.
++
++ This driver can only be built as a module ( = code which can be
++ inserted in and removed from the running kernel whenever you want).
++ The module will be called sx. If you want to do that, say M here.
++
++config RIO
++ tristate "Specialix RIO system support"
++ depends on SERIAL_NONSTANDARD && BROKEN
++ help
++ This is a driver for the Specialix RIO, a smart serial card which
++ drives an outboard box that can support up to 128 ports. Product
++ information is at <http://www.perle.com/support/documentation.html#multiport>.
++ There are both ISA and PCI versions.
++
++config RIO_OLDPCI
++ bool "Support really old RIO/PCI cards"
++ depends on RIO
++ help
++ Older RIO PCI cards need some initialization-time configuration to
++ determine the IRQ and some control addresses. If you have a RIO and
++ this doesn't seem to work, try setting this to Y.
++
++config STALDRV
++ bool "Stallion multiport serial support"
++ depends on SERIAL_NONSTANDARD
++ help
++ Stallion cards give you many serial ports. You would need something
++ like this to connect more than two modems to your Linux box, for
++ instance in order to become a dial-in server. If you say Y here,
++ you will be asked for your specific card model in the next
++ questions. Make sure to read <file:Documentation/serial/stallion.txt>
++ in this case. If you have never heard about all this, it's safe to
++ say N.
++
++config STALLION
++ tristate "Stallion EasyIO or EC8/32 support"
++ depends on STALDRV && (ISA || EISA || PCI)
++ help
++ If you have an EasyIO or EasyConnection 8/32 multiport Stallion
++ card, then this is for you; say Y. Make sure to read
++ <file:Documentation/serial/stallion.txt>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called stallion.
++
++config ISTALLION
++ tristate "Stallion EC8/64, ONboard, Brumby support"
++ depends on STALDRV && (ISA || EISA || PCI)
++ help
++ If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
++ serial multiport card, say Y here. Make sure to read
++ <file:Documentation/serial/stallion.txt>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called istallion.
++
++config NOZOMI
++ tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
++ depends on PCI && EXPERIMENTAL
++ help
++ If you have a HSDPA driver Broadband Wireless Data Card -
++ Globe Trotter PCMCIA card, say Y here.
++
++ To compile this driver as a module, choose M here, the module
++ will be called nozomi.
++
++config A2232
++ tristate "Commodore A2232 serial support (EXPERIMENTAL)"
++ depends on EXPERIMENTAL && ZORRO && BROKEN
++ ---help---
++ This option supports the 2232 7-port serial card shipped with the
++ Amiga 2000 and other Zorro-bus machines, dating from 1989. At
++ a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
++ each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
++ ports were connected with 8 pin DIN connectors on the card bracket,
++ for which 8 pin to DB25 adapters were supplied. The card also had
++ jumpers internally to toggle various pinning configurations.
++
++ This driver can be built as a module; but then "generic_serial"
++ will also be built as a module. This has to be loaded before
++ "ser_a2232". If you want to do this, answer M here.
++
++config SGI_SNSC
++ bool "SGI Altix system controller communication support"
++ depends on (IA64_SGI_SN2 || IA64_GENERIC)
++ help
++ If you have an SGI Altix and you want to enable system
++ controller communication from user space (you want this!),
++ say Y. Otherwise, say N.
++
++config SGI_TIOCX
++ bool "SGI TIO CX driver support"
++ depends on (IA64_SGI_SN2 || IA64_GENERIC)
++ help
++ If you have an SGI Altix and you have fpga devices attached
++ to your TIO, say Y here, otherwise say N.
++
++config SGI_MBCS
++ tristate "SGI FPGA Core Services driver support"
++ depends on SGI_TIOCX
++ help
++ If you have an SGI Altix with an attached SABrick
++ say Y or M here, otherwise say N.
++
++source "drivers/serial/Kconfig"
++
++config UNIX98_PTYS
++ bool "Unix98 PTY support" if EMBEDDED
++ default y
++ ---help---
++ A pseudo terminal (PTY) is a software device consisting of two
++ halves: a master and a slave. The slave device behaves identical to
++ a physical terminal; the master device is used by a process to
++ read data from and write data to the slave, thereby emulating a
++ terminal. Typical programs for the master side are telnet servers
++ and xterms.
++
++ Linux has traditionally used the BSD-like names /dev/ptyxx for
++ masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
++ has a number of problems. The GNU C library glibc 2.1 and later,
++ however, supports the Unix98 naming standard: in order to acquire a
++ pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
++ terminal is then made available to the process and the pseudo
++ terminal slave can be accessed as /dev/pts/<number>. What was
++ traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
++
++ All modern Linux systems use the Unix98 ptys. Say Y unless
++ you're on an embedded system and want to conserve memory.
++
++config DEVPTS_MULTIPLE_INSTANCES
++ bool "Support multiple instances of devpts"
++ depends on UNIX98_PTYS
++ default n
++ ---help---
++ Enable support for multiple instances of devpts filesystem.
++ If you want to have isolated PTY namespaces (eg: in containers),
++ say Y here. Otherwise, say N. If enabled, each mount of devpts
++ filesystem with the '-o newinstance' option will create an
++ independent PTY namespace.
++
++config LEGACY_PTYS
++ bool "Legacy (BSD) PTY support"
++ default y
++ ---help---
++ A pseudo terminal (PTY) is a software device consisting of two
++ halves: a master and a slave. The slave device behaves identical to
++ a physical terminal; the master device is used by a process to
++ read data from and write data to the slave, thereby emulating a
++ terminal. Typical programs for the master side are telnet servers
++ and xterms.
++
++ Linux has traditionally used the BSD-like names /dev/ptyxx
++ for masters and /dev/ttyxx for slaves of pseudo
++ terminals. This scheme has a number of problems, including
++ security. This option enables these legacy devices; on most
++ systems, it is safe to say N.
++
++
++config LEGACY_PTY_COUNT
++ int "Maximum number of legacy PTY in use"
++ depends on LEGACY_PTYS
++ range 0 256
++ default "256"
++ ---help---
++ The maximum number of legacy PTYs that can be used at any one time.
++ The default is 256, and should be more than enough. Embedded
++ systems may want to reduce this to save memory.
++
++ When not in use, each legacy PTY occupies 12 bytes on 32-bit
++ architectures and 24 bytes on 64-bit architectures.
++
++config BRIQ_PANEL
++ tristate 'Total Impact briQ front panel driver'
++ depends on PPC_CHRP
++ ---help---
++ The briQ is a small footprint CHRP computer with a frontpanel VFD, a
++ tristate led and two switches. It is the size of a CDROM drive.
++
++ If you have such one and want anything showing on the VFD then you
++ must answer Y here.
++
++ To compile this driver as a module, choose M here: the
++ module will be called briq_panel.
++
++ It's safe to say N here.
++
++config BFIN_OTP
++ tristate "Blackfin On-Chip OTP Memory Support"
++ depends on BLACKFIN && (BF51x || BF52x || BF54x)
++ default y
++ help
++ If you say Y here, you will get support for a character device
++ interface into the One Time Programmable memory pages that are
++ stored on the Blackfin processor. This will not get you access
++ to the secure memory pages however. You will need to write your
++ own secure code and reader for that.
++
++ To compile this driver as a module, choose M here: the module
++ will be called bfin-otp.
++
++ If unsure, it is safe to say Y.
++
++config BFIN_OTP_WRITE_ENABLE
++ bool "Enable writing support of OTP pages"
++ depends on BFIN_OTP
++ default n
++ help
++ If you say Y here, you will enable support for writing of the
++ OTP pages. This is dangerous by nature as you can only program
++ the pages once, so only enable this option when you actually
++ need it so as to not inadvertently clobber data.
++
++ If unsure, say N.
++
++config PRINTER
++ tristate "Parallel printer support"
++ depends on PARPORT
++ ---help---
++ If you intend to attach a printer to the parallel port of your Linux
++ box (as opposed to using a serial printer; if the connector at the
++ printer has 9 or 25 holes ["female"], then it's serial), say Y.
++ Also read the Printing-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ It is possible to share one parallel port among several devices
++ (e.g. printer and ZIP drive) and it is safe to compile the
++ corresponding drivers into the kernel.
++
++ To compile this driver as a module, choose M here and read
++ <file:Documentation/parport.txt>. The module will be called lp.
++
++ If you have several parallel ports, you can specify which ports to
++ use with the "lp" kernel command line option. (Try "man bootparam"
++ or see the documentation of your boot loader (lilo or loadlin) about
++ how to pass options to the kernel at boot time.) The syntax of the
++ "lp" command line option can be found in <file:drivers/char/lp.c>.
++
++ If you have more than 8 printers, you need to increase the LP_NO
++ macro in lp.c and the PARPORT_MAX macro in parport.h.
++
++config LP_CONSOLE
++ bool "Support for console on line printer"
++ depends on PRINTER
++ ---help---
++ If you want kernel messages to be printed out as they occur, you
++ can have a console on the printer. This option adds support for
++ doing that; to actually get it to happen you need to pass the
++ option "console=lp0" to the kernel at boot time.
++
++ If the printer is out of paper (or off, or unplugged, or too
++ busy..) the kernel will stall until the printer is ready again.
++ By defining CONSOLE_LP_STRICT to 0 (at your own risk) you
++ can make the kernel continue when this happens,
++ but it'll lose the kernel messages.
++
++ If unsure, say N.
++
++config PPDEV
++ tristate "Support for user-space parallel port device drivers"
++ depends on PARPORT
++ ---help---
++ Saying Y to this adds support for /dev/parport device nodes. This
++ is needed for programs that want portable access to the parallel
++ port, for instance deviceid (which displays Plug-and-Play device
++ IDs).
++
++ This is the parallel port equivalent of SCSI generic support (sg).
++ It is safe to say N to this -- it is not needed for normal printing
++ or parallel port CD-ROM/disk support.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ppdev.
++
++ If unsure, say N.
++
++config HVC_DRIVER
++ bool
++ help
++ Generic "hypervisor virtual console" infrastructure for various
++ hypervisors (pSeries, iSeries, Xen, lguest).
++ It will automatically be selected if one of the back-end console drivers
++ is selected.
++
++config HVC_IRQ
++ bool
++
++config HVC_CONSOLE
++ bool "pSeries Hypervisor Virtual Console support"
++ depends on PPC_PSERIES
++ select HVC_DRIVER
++ select HVC_IRQ
++ help
++ pSeries machines when partitioned support a hypervisor virtual
++ console. This driver allows each pSeries partition to have a console
++ which is accessed via the HMC.
++
++config HVC_ISERIES
++ bool "iSeries Hypervisor Virtual Console support"
++ depends on PPC_ISERIES
++ default y
++ select HVC_DRIVER
++ select HVC_IRQ
++ select VIOPATH
++ help
++ iSeries machines support a hypervisor virtual console.
++
++config HVC_RTAS
++ bool "IBM RTAS Console support"
++ depends on PPC_RTAS
++ select HVC_DRIVER
++ help
++ IBM Console device driver which makes use of RTAS
++
++config HVC_BEAT
++ bool "Toshiba's Beat Hypervisor Console support"
++ depends on PPC_CELLEB
++ select HVC_DRIVER
++ help
++ Toshiba's Cell Reference Set Beat Console device driver
++
++config HVC_IUCV
++ bool "z/VM IUCV Hypervisor console support (VM only)"
++ depends on S390
++ select HVC_DRIVER
++ select IUCV
++ default y
++ help
++ This driver provides a Hypervisor console (HVC) back-end to access
++ a Linux (console) terminal via a z/VM IUCV communication path.
++
++config HVC_XEN
++ bool "Xen Hypervisor Console support"
++ depends on XEN
++ select HVC_DRIVER
++ select HVC_IRQ
++ default y
++ help
++ Xen virtual console device driver
++
++config HVC_UDBG
++ bool "udbg based fake hypervisor console"
++ depends on PPC && EXPERIMENTAL
++ select HVC_DRIVER
++ default n
++
++config VIRTIO_CONSOLE
++ tristate "Virtio console"
++ depends on VIRTIO
++ select HVC_DRIVER
++ help
++ Virtio console for use with lguest and other hypervisors.
++
++ Also serves as a general-purpose serial device for data
++ transfer between the guest and host. Character devices at
++ /dev/vportNpn will be created when corresponding ports are
++ found, where N is the device number and n is the port number
++ within that device. If specified by the host, a sysfs
++ attribute called 'name' will be populated with a name for
++ the port which can be used by udev scripts to create a
++ symlink to the device.
++
++config HVCS
++ tristate "IBM Hypervisor Virtual Console Server support"
++ depends on PPC_PSERIES && HVC_CONSOLE
++ help
++ Partitionable IBM Power5 ppc64 machines allow hosting of
++ firmware virtual consoles from one Linux partition by
++ another Linux partition. This driver allows console data
++ from Linux partitions to be accessed through TTY device
++ interfaces in the device tree of a Linux partition running
++ this driver.
++
++ To compile this driver as a module, choose M here: the
++ module will be called hvcs. Additionally, this module
++ will depend on arch specific APIs exported from hvcserver.ko
++ which will also be compiled when this driver is built as a
++ module.
++
++config IBM_BSR
++ tristate "IBM POWER Barrier Synchronization Register support"
++ depends on PPC_PSERIES
++ help
++ This devices exposes a hardware mechanism for fast synchronization
++ of threads across a large system which avoids bouncing a cacheline
++ between several cores on a system
++
++source "drivers/char/ipmi/Kconfig"
++
++config DS1620
++ tristate "NetWinder thermometer support"
++ depends on ARCH_NETWINDER
++ help
++ Say Y here to include support for the thermal management hardware
++ found in the NetWinder. This driver allows the user to control the
++ temperature set points and to read the current temperature.
++
++ It is also possible to say M here to build it as a module (ds1620)
++ It is recommended to be used on a NetWinder, but it is not a
++ necessity.
++
++config NWBUTTON
++ tristate "NetWinder Button"
++ depends on ARCH_NETWINDER
++ ---help---
++ If you say Y here and create a character device node /dev/nwbutton
++ with major and minor numbers 10 and 158 ("man mknod"), then every
++ time the orange button is pressed a number of times, the number of
++ times the button was pressed will be written to that device.
++
++ This is most useful for applications, as yet unwritten, which
++ perform actions based on how many times the button is pressed in a
++ row.
++
++ Do not hold the button down for too long, as the driver does not
++ alter the behaviour of the hardware reset circuitry attached to the
++ button; it will still execute a hard reset if the button is held
++ down for longer than approximately five seconds.
++
++ To compile this driver as a module, choose M here: the
++ module will be called nwbutton.
++
++ Most people will answer Y to this question and "Reboot Using Button"
++ below to be able to initiate a system shutdown from the button.
++
++config NWBUTTON_REBOOT
++ bool "Reboot Using Button"
++ depends on NWBUTTON
++ help
++ If you say Y here, then you will be able to initiate a system
++ shutdown and reboot by pressing the orange button a number of times.
++ The number of presses to initiate the shutdown is two by default,
++ but this can be altered by modifying the value of NUM_PRESSES_REBOOT
++ in nwbutton.h and recompiling the driver or, if you compile the
++ driver as a module, you can specify the number of presses at load
++ time with "insmod button reboot_count=<something>".
++
++config NWFLASH
++ tristate "NetWinder flash support"
++ depends on ARCH_NETWINDER
++ ---help---
++ If you say Y here and create a character device /dev/flash with
++ major 10 and minor 160 you can manipulate the flash ROM containing
++ the NetWinder firmware. Be careful as accidentally overwriting the
++ flash contents can render your computer unbootable. On no account
++ allow random users access to this device. :-)
++
++ To compile this driver as a module, choose M here: the
++ module will be called nwflash.
++
++ If you're not sure, say N.
++
++source "drivers/char/hw_random/Kconfig"
++
++config NVRAM
++ tristate "/dev/nvram support"
++ depends on ATARI || X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM
++ ---help---
++ If you say Y here and create a character special file /dev/nvram
++ with major number 10 and minor number 144 using mknod ("man mknod"),
++ you get read and write access to the extra bytes of non-volatile
++ memory in the real time clock (RTC), which is contained in every PC
++ and most Ataris. The actual number of bytes varies, depending on the
++ nvram in the system, but is usually 114 (128-14 for the RTC).
++
++ This memory is conventionally called "CMOS RAM" on PCs and "NVRAM"
++ on Ataris. /dev/nvram may be used to view settings there, or to
++ change them (with some utility). It could also be used to frequently
++ save a few bits of very important data that may not be lost over
++ power-off and for which writing to disk is too insecure. Note
++ however that most NVRAM space in a PC belongs to the BIOS and you
++ should NEVER idly tamper with it. See Ralf Brown's interrupt list
++ for a guide to the use of CMOS bytes by your BIOS.
++
++ On Atari machines, /dev/nvram is always configured and does not need
++ to be selected.
++
++ To compile this driver as a module, choose M here: the
++ module will be called nvram.
++
++#
++# These legacy RTC drivers just cause too many conflicts with the generic
++# RTC framework ... let's not even try to coexist any more.
++#
++if RTC_LIB=n
++
++config RTC
++ tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)"
++ depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
++ && !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN
++ ---help---
++ If you say Y here and create a character special file /dev/rtc with
++ major number 10 and minor number 135 using mknod ("man mknod"), you
++ will get access to the real time clock (or hardware clock) built
++ into your computer.
++
++ Every PC has such a clock built in. It can be used to generate
++ signals from as low as 1Hz up to 8192Hz, and can also be used
++ as a 24 hour alarm. It reports status information via the file
++ /proc/driver/rtc and its behaviour is set by various ioctls on
++ /dev/rtc.
++
++ If you run Linux on a multiprocessor machine and said Y to
++ "Symmetric Multi Processing" above, you should say Y here to read
++ and set the RTC in an SMP compatible fashion.
++
++ If you think you have a use for such a device (such as periodic data
++ sampling), then say Y here, and read <file:Documentation/rtc.txt>
++ for details.
++
++ To compile this driver as a module, choose M here: the
++ module will be called rtc.
++
++config JS_RTC
++ tristate "Enhanced Real Time Clock Support"
++ depends on SPARC32 && PCI
++ ---help---
++ If you say Y here and create a character special file /dev/rtc with
++ major number 10 and minor number 135 using mknod ("man mknod"), you
++ will get access to the real time clock (or hardware clock) built
++ into your computer.
++
++ Every PC has such a clock built in. It can be used to generate
++ signals from as low as 1Hz up to 8192Hz, and can also be used
++ as a 24 hour alarm. It reports status information via the file
++ /proc/driver/rtc and its behaviour is set by various ioctls on
++ /dev/rtc.
++
++ If you think you have a use for such a device (such as periodic data
++ sampling), then say Y here, and read <file:Documentation/rtc.txt>
++ for details.
++
++ To compile this driver as a module, choose M here: the
++ module will be called js-rtc.
++
++config GEN_RTC
++ tristate "Generic /dev/rtc emulation"
++ depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN
++ ---help---
++ If you say Y here and create a character special file /dev/rtc with
++ major number 10 and minor number 135 using mknod ("man mknod"), you
++ will get access to the real time clock (or hardware clock) built
++ into your computer.
++
++ It reports status information via the file /proc/driver/rtc and its
++ behaviour is set by various ioctls on /dev/rtc. If you enable the
++ "extended RTC operation" below it will also provide an emulation
++ for RTC_UIE which is required by some programs and may improve
++ precision in some cases.
++
++ To compile this driver as a module, choose M here: the
++ module will be called genrtc.
++
++config GEN_RTC_X
++ bool "Extended RTC operation"
++ depends on GEN_RTC
++ help
++ Provides an emulation for RTC_UIE which is required by some programs
++ and may improve precision of the generic RTC support in some cases.
++
++config EFI_RTC
++ bool "EFI Real Time Clock Services"
++ depends on IA64
++
++config DS1302
++ tristate "DS1302 RTC support"
++ depends on M32R && (PLAT_M32700UT || PLAT_OPSPUT)
++ help
++ If you say Y here and create a character special file /dev/rtc with
++ major number 121 and minor number 0 using mknod ("man mknod"), you
++ will get access to the real time clock (or hardware clock) built
++ into your computer.
++
++endif # RTC_LIB
++
++config DTLK
++ tristate "Double Talk PC internal speech card support"
++ depends on ISA
++ help
++ This driver is for the DoubleTalk PC, a speech synthesizer
++ manufactured by RC Systems (<http://www.rcsys.com/>). It is also
++ called the `internal DoubleTalk'.
++
++ To compile this driver as a module, choose M here: the
++ module will be called dtlk.
++
++config XILINX_HWICAP
++ tristate "Xilinx HWICAP Support"
++ depends on XILINX_VIRTEX || MICROBLAZE
++ help
++ This option enables support for Xilinx Internal Configuration
++ Access Port (ICAP) driver. The ICAP is used on Xilinx Virtex
++ FPGA platforms to partially reconfigure the FPGA at runtime.
++
++ If unsure, say N.
++
++config R3964
++ tristate "Siemens R3964 line discipline"
++ ---help---
++ This driver allows synchronous communication with devices using the
++ Siemens R3964 packet protocol. Unless you are dealing with special
++ hardware like PLCs, you are unlikely to need this.
++
++ To compile this driver as a module, choose M here: the
++ module will be called n_r3964.
++
++ If unsure, say N.
++
++config APPLICOM
++ tristate "Applicom intelligent fieldbus card support"
++ depends on PCI
++ ---help---
++ This driver provides the kernel-side support for the intelligent
++ fieldbus cards made by Applicom International. More information
++ about these cards can be found on the WWW at the address
++ <http://www.applicom-int.com/>, or by email from David Woodhouse
++ <dwmw2@infradead.org>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called applicom.
++
++ If unsure, say N.
++
++config SONYPI
++ tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"
++ depends on EXPERIMENTAL && X86 && PCI && INPUT && !64BIT
++ ---help---
++ This driver enables access to the Sony Programmable I/O Control
++ Device which can be found in many (all ?) Sony Vaio laptops.
++
++ If you have one of those laptops, read
++ <file:Documentation/laptops/sonypi.txt>, and say Y or M here.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sonypi.
++
++config GPIO_TB0219
++ tristate "TANBAC TB0219 GPIO support"
++ depends on TANBAC_TB022X
++ select GPIO_VR41XX
++
++source "drivers/char/pcmcia/Kconfig"
++
++config MWAVE
++ tristate "ACP Modem (Mwave) support"
++ depends on X86
++ select SERIAL_8250
++ ---help---
++ The ACP modem (Mwave) for Linux is a WinModem. It is composed of a
++ kernel driver and a user level application. Together these components
++ support direct attachment to public switched telephone networks (PSTNs)
++ and support selected world wide countries.
++
++ This version of the ACP Modem driver supports the IBM Thinkpad 600E,
++ 600, and 770 that include on board ACP modem hardware.
++
++ The modem also supports the standard communications port interface
++ (ttySx) and is compatible with the Hayes AT Command Set.
++
++ The user level application needed to use this driver can be found at
++ the IBM Linux Technology Center (LTC) web site:
++ <http://www.ibm.com/linux/ltc/>.
++
++ If you own one of the above IBM Thinkpads which has the Mwave chipset
++ in it, say Y.
++
++ To compile this driver as a module, choose M here: the
++ module will be called mwave.
++
++config SCx200_GPIO
++ tristate "NatSemi SCx200 GPIO Support"
++ depends on SCx200
++ select NSC_GPIO
++ help
++ Give userspace access to the GPIO pins on the National
++ Semiconductor SCx200 processors.
++
++ If compiled as a module, it will be called scx200_gpio.
++
++config PC8736x_GPIO
++ tristate "NatSemi PC8736x GPIO Support"
++ depends on X86
++ default SCx200_GPIO # mostly N
++ select NSC_GPIO # needed for support routines
++ help
++ Give userspace access to the GPIO pins on the National
++ Semiconductor PC-8736x (x=[03456]) SuperIO chip. The chip
++ has multiple functional units, inc several managed by
++ hwmon/pc87360 driver. Tested with PC-87366
++
++ If compiled as a module, it will be called pc8736x_gpio.
++
++config NSC_GPIO
++ tristate "NatSemi Base GPIO Support"
++ depends on X86_32
++ # selected by SCx200_GPIO and PC8736x_GPIO
++ # what about 2 selectors differing: m != y
++ help
++ Common support used (and needed) by scx200_gpio and
++ pc8736x_gpio drivers. If those drivers are built as
++ modules, this one will be too, named nsc_gpio
++
++config CS5535_GPIO
++ tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"
++ depends on X86_32
++ help
++ Give userspace access to the GPIO pins on the AMD CS5535 and
++ CS5536 Geode companion devices.
++
++ If compiled as a module, it will be called cs5535_gpio.
++
++config RAW_DRIVER
++ tristate "RAW driver (/dev/raw/rawN)"
++ depends on BLOCK
++ help
++ The raw driver permits block devices to be bound to /dev/raw/rawN.
++ Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.
++ See the raw(8) manpage for more details.
++
++ Applications should preferably open the device (eg /dev/hda1)
++ with the O_DIRECT flag.
++
++config MAX_RAW_DEVS
++ int "Maximum number of RAW devices to support (1-8192)"
++ depends on RAW_DRIVER
++ default "256"
++ help
++ The maximum number of RAW devices that are supported.
++ Default is 256. Increase this number in case you need lots of
++ raw devices.
++
++config HPET
++ bool "HPET - High Precision Event Timer" if (X86 || IA64)
++ default n
++ depends on ACPI
++ help
++ If you say Y here, you will have a miscdevice named "/dev/hpet/". Each
++ open selects one of the timers supported by the HPET. The timers are
++ non-periodic and/or periodic.
++
++config HPET_MMAP
++ bool "Allow mmap of HPET"
++ default y
++ depends on HPET
++ help
++ If you say Y here, user applications will be able to mmap
++ the HPET registers.
++
++ In some hardware implementations, the page containing HPET
++ registers may also contain other things that shouldn't be
++ exposed to the user. If this applies to your hardware,
++ say N here.
++
++config HANGCHECK_TIMER
++ tristate "Hangcheck timer"
++ depends on X86 || IA64 || PPC64 || S390
++ help
++ The hangcheck-timer module detects when the system has gone
++ out to lunch past a certain margin. It can reboot the system
++ or merely print a warning.
++
++config MMTIMER
++ tristate "MMTIMER Memory mapped RTC for SGI Altix"
++ depends on IA64_GENERIC || IA64_SGI_SN2
++ default y
++ help
++ The mmtimer device allows direct userspace access to the
++ Altix system timer.
++
++config UV_MMTIMER
++ tristate "UV_MMTIMER Memory mapped RTC for SGI UV"
++ depends on X86_UV
++ default m
++ help
++ The uv_mmtimer device allows direct userspace access to the
++ UV system timer.
++
++source "drivers/char/tpm/Kconfig"
++
++config TELCLOCK
++ tristate "Telecom clock driver for ATCA SBC"
++ depends on EXPERIMENTAL && X86
++ default n
++ help
++ The telecom clock device is specific to the MPCBL0010 and MPCBL0050
++ ATCA computers and allows direct userspace access to the
++ configuration of the telecom clock configuration settings. This
++ device is used for hardware synchronization across the ATCA backplane
++ fabric. Upon loading, the driver exports a sysfs directory,
++ /sys/devices/platform/telco_clock, with a number of files for
++ controlling the behavior of this hardware.
++
++config DEVPORT
++ bool
++ depends on !M68K
++ depends on ISA || PCI
++ default y
++
++source "drivers/s390/char/Kconfig"
++
++config RAMOOPS
++ tristate "Log panic/oops to a RAM buffer"
++ depends on HAS_IOMEM
++ default n
++ help
++ This enables panic and oops messages to be logged to a circular
++ buffer in RAM where it can be read back at some later point.
++
++endmenu
++
+diff -Nur linux-2.6.35.7.orig/drivers/char/Makefile linux-2.6.35.7/drivers/char/Makefile
+--- linux-2.6.35.7.orig/drivers/char/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/char/Makefile 2010-10-14 20:27:59.875601109 +0200
+@@ -96,6 +96,7 @@
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o
@@ -10173,9 +13052,152 @@ diff -Nur linux-2.6.34.orig/drivers/char/Makefile linux-2.6.34/drivers/char/Make
obj-$(CONFIG_GPIO_TB0219) += tb0219.o
obj-$(CONFIG_TELCLOCK) += tlclk.o
-diff -Nur linux-2.6.34.orig/drivers/gpio/nxp_74hc153.c linux-2.6.34/drivers/gpio/nxp_74hc153.c
---- linux-2.6.34.orig/drivers/gpio/nxp_74hc153.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/gpio/nxp_74hc153.c 2010-05-25 18:46:08.913464115 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/char/Makefile.orig linux-2.6.35.7/drivers/char/Makefile.orig
+--- linux-2.6.35.7.orig/drivers/char/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/char/Makefile.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,139 @@
++#
++# Makefile for the kernel character device drivers.
++#
++
++#
++# This file contains the font map for the default (hardware) font
++#
++FONTMAPFILE = cp437.uni
++
++obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o
++
++obj-$(CONFIG_LEGACY_PTYS) += pty.o
++obj-$(CONFIG_UNIX98_PTYS) += pty.o
++obj-y += misc.o
++obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o
++obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
++obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
++obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
++obj-$(CONFIG_AUDIT) += tty_audit.o
++obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
++obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
++obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
++obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
++obj-$(CONFIG_ROCKETPORT) += rocket.o
++obj-$(CONFIG_SERIAL167) += serial167.o
++obj-$(CONFIG_CYCLADES) += cyclades.o
++obj-$(CONFIG_STALLION) += stallion.o
++obj-$(CONFIG_ISTALLION) += istallion.o
++obj-$(CONFIG_NOZOMI) += nozomi.o
++obj-$(CONFIG_DIGIEPCA) += epca.o
++obj-$(CONFIG_SPECIALIX) += specialix.o
++obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
++obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
++obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
++obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
++obj-$(CONFIG_COMPUTONE) += ip2/
++obj-$(CONFIG_RISCOM8) += riscom8.o
++obj-$(CONFIG_ISI) += isicom.o
++obj-$(CONFIG_SYNCLINK) += synclink.o
++obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
++obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
++obj-$(CONFIG_N_HDLC) += n_hdlc.o
++obj-$(CONFIG_N_GSM) += n_gsm.o
++obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
++obj-$(CONFIG_SX) += sx.o generic_serial.o
++obj-$(CONFIG_RIO) += rio/ generic_serial.o
++obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o
++obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o
++obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o
++obj-$(CONFIG_HVC_BEAT) += hvc_beat.o
++obj-$(CONFIG_HVC_DRIVER) += hvc_console.o
++obj-$(CONFIG_HVC_IRQ) += hvc_irq.o
++obj-$(CONFIG_HVC_XEN) += hvc_xen.o
++obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
++obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
++obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
++obj-$(CONFIG_RAW_DRIVER) += raw.o
++obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
++obj-$(CONFIG_MSPEC) += mspec.o
++obj-$(CONFIG_MMTIMER) += mmtimer.o
++obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o
++obj-$(CONFIG_VIOTAPE) += viotape.o
++obj-$(CONFIG_HVCS) += hvcs.o
++obj-$(CONFIG_IBM_BSR) += bsr.o
++obj-$(CONFIG_SGI_MBCS) += mbcs.o
++obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
++obj-$(CONFIG_BFIN_OTP) += bfin-otp.o
++
++obj-$(CONFIG_PRINTER) += lp.o
++
++obj-$(CONFIG_APM_EMULATION) += apm-emulation.o
++
++obj-$(CONFIG_DTLK) += dtlk.o
++obj-$(CONFIG_R3964) += n_r3964.o
++obj-$(CONFIG_APPLICOM) += applicom.o
++obj-$(CONFIG_SONYPI) += sonypi.o
++obj-$(CONFIG_RTC) += rtc.o
++obj-$(CONFIG_HPET) += hpet.o
++obj-$(CONFIG_GEN_RTC) += genrtc.o
++obj-$(CONFIG_EFI_RTC) += efirtc.o
++obj-$(CONFIG_DS1302) += ds1302.o
++obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
++ifeq ($(CONFIG_GENERIC_NVRAM),y)
++ obj-$(CONFIG_NVRAM) += generic_nvram.o
++else
++ obj-$(CONFIG_NVRAM) += nvram.o
++endif
++obj-$(CONFIG_TOSHIBA) += toshiba.o
++obj-$(CONFIG_I8K) += i8k.o
++obj-$(CONFIG_DS1620) += ds1620.o
++obj-$(CONFIG_HW_RANDOM) += hw_random/
++obj-$(CONFIG_PPDEV) += ppdev.o
++obj-$(CONFIG_NWBUTTON) += nwbutton.o
++obj-$(CONFIG_NWFLASH) += nwflash.o
++obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
++obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
++obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
++obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o
++obj-$(CONFIG_GPIO_TB0219) += tb0219.o
++obj-$(CONFIG_TELCLOCK) += tlclk.o
++
++obj-$(CONFIG_MWAVE) += mwave/
++obj-$(CONFIG_AGP) += agp/
++obj-$(CONFIG_PCMCIA) += pcmcia/
++obj-$(CONFIG_IPMI_HANDLER) += ipmi/
++
++obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
++obj-$(CONFIG_TCG_TPM) += tpm/
++
++obj-$(CONFIG_PS3_FLASH) += ps3flash.o
++obj-$(CONFIG_RAMOOPS) += ramoops.o
++
++obj-$(CONFIG_JS_RTC) += js-rtc.o
++js-rtc-y = rtc.o
++
++# Files generated that shall be removed upon make clean
++clean-files := consolemap_deftbl.c defkeymap.c
++
++quiet_cmd_conmk = CONMK $@
++ cmd_conmk = scripts/conmakehash $< > $@
++
++$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
++ $(call cmd,conmk)
++
++$(obj)/defkeymap.o: $(obj)/defkeymap.c
++
++# Uncomment if you're changing the keymap and have an appropriate
++# loadkeys version for the map. By default, we'll use the shipped
++# versions.
++# GENERATE_KEYMAP := 1
++
++ifdef GENERATE_KEYMAP
++
++$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
++ loadkeys --mktable $< > $@.tmp
++ sed -e 's/^static *//' $@.tmp > $@
++ rm $@.tmp
++
++endif
+diff -Nur linux-2.6.35.7.orig/drivers/gpio/nxp_74hc153.c linux-2.6.35.7/drivers/gpio/nxp_74hc153.c
+--- linux-2.6.35.7.orig/drivers/gpio/nxp_74hc153.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/gpio/nxp_74hc153.c 2010-10-14 20:27:59.918101359 +0200
@@ -0,0 +1,246 @@
+/*
+ * NXP 74HC153 - Dual 4-input multiplexer GPIO driver
@@ -10423,9 +13445,9 @@ diff -Nur linux-2.6.34.orig/drivers/gpio/nxp_74hc153.c linux-2.6.34/drivers/gpio
+MODULE_DESCRIPTION("GPIO expander driver for NXP 74HC153");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" NXP_74HC153_DRIVER_NAME);
-diff -Nur linux-2.6.34.orig/drivers/input/misc/gpio_buttons.c linux-2.6.34/drivers/input/misc/gpio_buttons.c
---- linux-2.6.34.orig/drivers/input/misc/gpio_buttons.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/input/misc/gpio_buttons.c 2010-05-25 18:46:08.953464216 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/input/misc/gpio_buttons.c linux-2.6.35.7/drivers/input/misc/gpio_buttons.c
+--- linux-2.6.35.7.orig/drivers/input/misc/gpio_buttons.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/input/misc/gpio_buttons.c 2010-10-14 20:27:59.954442279 +0200
@@ -0,0 +1,216 @@
+/*
+ * Driver for buttons on GPIO lines not capable of generating interrupts
@@ -10643,10 +13665,10 @@ diff -Nur linux-2.6.34.orig/drivers/input/misc/gpio_buttons.c linux-2.6.34/drive
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION("Polled buttons driver for CPU GPIOs");
+
-diff -Nur linux-2.6.34.orig/drivers/input/misc/Kconfig linux-2.6.34/drivers/input/misc/Kconfig
---- linux-2.6.34.orig/drivers/input/misc/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/input/misc/Kconfig 2010-05-25 18:46:08.990963497 +0200
-@@ -340,4 +340,20 @@
+diff -Nur linux-2.6.35.7.orig/drivers/input/misc/Kconfig linux-2.6.35.7/drivers/input/misc/Kconfig
+--- linux-2.6.35.7.orig/drivers/input/misc/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/input/misc/Kconfig 2010-10-14 20:27:59.998101300 +0200
+@@ -390,4 +390,20 @@
To compile this driver as a module, choose M here: the
module will be called pcap_keys.
@@ -10667,18 +13689,459 @@ diff -Nur linux-2.6.34.orig/drivers/input/misc/Kconfig linux-2.6.34/drivers/inpu
+ module will be called gpio-buttons.
+
endif
-diff -Nur linux-2.6.34.orig/drivers/input/misc/Makefile linux-2.6.34/drivers/input/misc/Makefile
---- linux-2.6.34.orig/drivers/input/misc/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/input/misc/Makefile 2010-05-25 18:46:09.023464096 +0200
-@@ -32,4 +32,5 @@
+diff -Nur linux-2.6.35.7.orig/drivers/input/misc/Kconfig.orig linux-2.6.35.7/drivers/input/misc/Kconfig.orig
+--- linux-2.6.35.7.orig/drivers/input/misc/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/input/misc/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,393 @@
++#
++# Input misc drivers configuration
++#
++menuconfig INPUT_MISC
++ bool "Miscellaneous devices"
++ help
++ Say Y here, and a list of miscellaneous input drivers will be displayed.
++ Everything that didn't fit into the other categories is here. This option
++ doesn't affect the kernel.
++
++ If unsure, say Y.
++
++if INPUT_MISC
++
++config INPUT_88PM860X_ONKEY
++ tristate "88PM860x ONKEY support"
++ depends on MFD_88PM860X
++ help
++ Support the ONKEY of Marvell 88PM860x PMICs as an input device
++ reporting power button status.
++
++ To compile this driver as a module, choose M here: the module
++ will be called 88pm860x_onkey.
++
++config INPUT_AD714X
++ tristate "Analog Devices AD714x Capacitance Touch Sensor"
++ help
++ Say Y here if you want to support an AD7142/3/7/8/7A touch sensor.
++
++ You should select a bus connection too.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ad714x.
++
++config INPUT_AD714X_I2C
++ tristate "support I2C bus connection"
++ depends on INPUT_AD714X && I2C
++ default y
++ help
++ Say Y here if you have AD7142/AD7147 hooked to an I2C bus.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ad714x-i2c.
++
++config INPUT_AD714X_SPI
++ tristate "support SPI bus connection"
++ depends on INPUT_AD714X && SPI
++ default y
++ help
++ Say Y here if you have AD7142/AD7147 hooked to a SPI bus.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ad714x-spi.
++
++config INPUT_PCSPKR
++ tristate "PC Speaker support"
++ depends on PCSPKR_PLATFORM
++ help
++ Say Y here if you want the standard PC Speaker to be used for
++ bells and whistles.
++
++ If unsure, say Y.
++
++ To compile this driver as a module, choose M here: the
++ module will be called pcspkr.
++
++config INPUT_SPARCSPKR
++ tristate "SPARC Speaker support"
++ depends on PCI && SPARC64
++ help
++ Say Y here if you want the standard Speaker on Sparc PCI systems
++ to be used for bells and whistles.
++
++ If unsure, say Y.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sparcspkr.
++
++config INPUT_M68K_BEEP
++ tristate "M68k Beeper support"
++ depends on M68K
++
++config INPUT_MAX8925_ONKEY
++ tristate "MAX8925 ONKEY support"
++ depends on MFD_MAX8925
++ help
++ Support the ONKEY of MAX8925 PMICs as an input device
++ reporting power button status.
++
++ To compile this driver as a module, choose M here: the module
++ will be called max8925_onkey.
++
++config INPUT_APANEL
++ tristate "Fujitsu Lifebook Application Panel buttons"
++ depends on X86 && I2C && LEDS_CLASS
++ select INPUT_POLLDEV
++ select CHECK_SIGNATURE
++ help
++ Say Y here for support of the Application Panel buttons, used on
++ Fujitsu Lifebook. These are attached to the mainboard through
++ an SMBus interface managed by the I2C Intel ICH (i801) driver,
++ which you should also build for this kernel.
++
++ To compile this driver as a module, choose M here: the module will
++ be called apanel.
++
++config INPUT_IXP4XX_BEEPER
++ tristate "IXP4XX Beeper support"
++ depends on ARCH_IXP4XX
++ help
++ If you say yes here, you can connect a beeper to the
++ ixp4xx gpio pins. This is used by the LinkSys NSLU2.
++
++ If unsure, say Y.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ixp4xx-beeper.
++
++config INPUT_COBALT_BTNS
++ tristate "Cobalt button interface"
++ depends on MIPS_COBALT
++ select INPUT_POLLDEV
++ help
++ Say Y here if you want to support MIPS Cobalt button interface.
++
++ To compile this driver as a module, choose M here: the
++ module will be called cobalt_btns.
++
++config INPUT_WISTRON_BTNS
++ tristate "x86 Wistron laptop button interface"
++ depends on X86 && !X86_64
++ select INPUT_POLLDEV
++ select INPUT_SPARSEKMAP
++ select NEW_LEDS
++ select LEDS_CLASS
++ select CHECK_SIGNATURE
++ help
++ Say Y here for support of Wistron laptop button interfaces, used on
++ laptops of various brands, including Acer and Fujitsu-Siemens. If
++ available, mail and wifi LEDs will be controllable via /sys/class/leds.
++
++ To compile this driver as a module, choose M here: the module will
++ be called wistron_btns.
++
++config INPUT_ATLAS_BTNS
++ tristate "x86 Atlas button interface"
++ depends on X86 && ACPI
++ help
++ Say Y here for support of Atlas wallmount touchscreen buttons.
++ The events will show up as scancodes F1 through F9 via evdev.
++
++ To compile this driver as a module, choose M here: the module will
++ be called atlas_btns.
++
++config INPUT_ATI_REMOTE
++ tristate "ATI / X10 USB RF remote control"
++ depends on USB_ARCH_HAS_HCD
++ select USB
++ help
++ Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
++ These are RF remotes with USB receivers.
++ The ATI remote comes with many of ATI's All-In-Wonder video cards.
++ The X10 "Lola" remote is available at:
++ <http://www.x10.com/products/lola_sg1.htm>
++ This driver provides mouse pointer, left and right mouse buttons,
++ and maps all the other remote buttons to keypress events.
++
++ To compile this driver as a module, choose M here: the module will be
++ called ati_remote.
++
++config INPUT_ATI_REMOTE2
++ tristate "ATI / Philips USB RF remote control"
++ depends on USB_ARCH_HAS_HCD
++ select USB
++ help
++ Say Y here if you want to use an ATI or Philips USB RF remote control.
++ These are RF remotes with USB receivers.
++ ATI Remote Wonder II comes with some ATI's All-In-Wonder video cards
++ and is also available as a separate product.
++ This driver provides mouse pointer, left and right mouse buttons,
++ and maps all the other remote buttons to keypress events.
++
++ To compile this driver as a module, choose M here: the module will be
++ called ati_remote2.
++
++config INPUT_KEYSPAN_REMOTE
++ tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
++ depends on EXPERIMENTAL
++ depends on USB_ARCH_HAS_HCD
++ select USB
++ help
++ Say Y here if you want to use a Keyspan DMR USB remote control.
++ Currently only the UIA-11 type of receiver has been tested. The tag
++ on the receiver that connects to the USB port should have a P/N that
++ will tell you what type of DMR you have. The UIA-10 type is not
++ supported at this time. This driver maps all buttons to keypress
++ events.
++
++ To compile this driver as a module, choose M here: the module will
++ be called keyspan_remote.
++
++config INPUT_POWERMATE
++ tristate "Griffin PowerMate and Contour Jog support"
++ depends on USB_ARCH_HAS_HCD
++ select USB
++ help
++ Say Y here if you want to use Griffin PowerMate or Contour Jog devices.
++ These are aluminum dials which can measure clockwise and anticlockwise
++ rotation. The dial also acts as a pushbutton. The base contains an LED
++ which can be instructed to pulse or to switch to a particular intensity.
++
++ You can download userspace tools from
++ <http://sowerbutts.com/powermate/>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called powermate.
++
++config INPUT_YEALINK
++ tristate "Yealink usb-p1k voip phone"
++ depends on EXPERIMENTAL
++ depends on USB_ARCH_HAS_HCD
++ select USB
++ help
++ Say Y here if you want to enable keyboard and LCD functions of the
++ Yealink usb-p1k usb phones. The audio part is enabled by the generic
++ usb sound driver, so you might want to enable that as well.
++
++ For information about how to use these additional functions, see
++ <file:Documentation/input/yealink.txt>.
++
++ To compile this driver as a module, choose M here: the module will be
++ called yealink.
++
++config INPUT_CM109
++ tristate "C-Media CM109 USB I/O Controller"
++ depends on EXPERIMENTAL
++ depends on USB_ARCH_HAS_HCD
++ select USB
++ help
++ Say Y here if you want to enable keyboard and buzzer functions of the
++ C-Media CM109 usb phones. The audio part is enabled by the generic
++ usb sound driver, so you might want to enable that as well.
++
++ To compile this driver as a module, choose M here: the module will be
++ called cm109.
++
++config INPUT_TWL4030_PWRBUTTON
++ tristate "TWL4030 Power button Driver"
++ depends on TWL4030_CORE
++ help
++ Say Y here if you want to enable power key reporting via the
++ TWL4030 family of chips.
++
++ To compile this driver as a module, choose M here. The module will
++ be called twl4030_pwrbutton.
++
++config INPUT_TWL4030_VIBRA
++ tristate "Support for TWL4030 Vibrator"
++ depends on TWL4030_CORE
++ select TWL4030_CODEC
++ select INPUT_FF_MEMLESS
++ help
++ This option enables support for TWL4030 Vibrator Driver.
++
++ To compile this driver as a module, choose M here. The module will
++ be called twl4030_vibra.
++
++config INPUT_UINPUT
++ tristate "User level driver support"
++ help
++ Say Y here if you want to support user level drivers for input
++ subsystem accessible under char device 10:223 - /dev/input/uinput.
++
++ To compile this driver as a module, choose M here: the
++ module will be called uinput.
++
++config INPUT_SGI_BTNS
++ tristate "SGI Indy/O2 volume button interface"
++ depends on SGI_IP22 || SGI_IP32
++ select INPUT_POLLDEV
++ help
++ Say Y here if you want to support SGI Indy/O2 volume button interface.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sgi_btns.
++
++config INPUT_WINBOND_CIR
++ tristate "Winbond IR remote control"
++ depends on X86 && PNP
++ select NEW_LEDS
++ select LEDS_CLASS
++ select LEDS_TRIGGERS
++ select BITREVERSE
++ help
++ Say Y here if you want to use the IR remote functionality found
++ in some Winbond SuperI/O chips. Currently only the WPCD376I
++ chip is supported (included in some Intel Media series motherboards).
++
++ IR Receive and wake-on-IR from suspend and power-off is currently
++ supported.
++
++ To compile this driver as a module, choose M here: the module will be
++ called winbond_cir.
++
++config HP_SDC_RTC
++ tristate "HP SDC Real Time Clock"
++ depends on (GSC || HP300) && SERIO
++ select HP_SDC
++ help
++ Say Y here if you want to support the built-in real time clock
++ of the HP SDC controller.
++
++config INPUT_PCF50633_PMU
++ tristate "PCF50633 PMU events"
++ depends on MFD_PCF50633
++ help
++ Say Y to include support for delivering PMU events via input
++ layer on NXP PCF50633.
++
++config INPUT_PCF8574
++ tristate "PCF8574 Keypad input device"
++ depends on I2C && EXPERIMENTAL
++ help
++ Say Y here if you want to support a keypad connetced via I2C
++ with a PCF8574.
++
++ To compile this driver as a module, choose M here: the
++ module will be called pcf8574_keypad.
++
++config INPUT_GPIO_ROTARY_ENCODER
++ tristate "Rotary encoders connected to GPIO pins"
++ depends on GPIOLIB && GENERIC_GPIO
++ help
++ Say Y here to add support for rotary encoders connected to GPIO lines.
++ Check file:Documentation/input/rotary-encoder.txt for more
++ information.
++
++ To compile this driver as a module, choose M here: the
++ module will be called rotary_encoder.
++
++config INPUT_RB532_BUTTON
++ tristate "Mikrotik Routerboard 532 button interface"
++ depends on MIKROTIK_RB532
++ depends on GPIOLIB && GENERIC_GPIO
++ select INPUT_POLLDEV
++ help
++ Say Y here if you want support for the S1 button built into
++ Mikrotik's Routerboard 532.
++
++ To compile this driver as a module, choose M here: the
++ module will be called rb532_button.
++
++config INPUT_DM355EVM
++ tristate "TI DaVinci DM355 EVM Keypad and IR Remote"
++ depends on MFD_DM355EVM_MSP
++ select INPUT_SPARSEKMAP
++ help
++ Supports the pushbuttons and IR remote used with
++ the DM355 EVM board.
++
++ To compile this driver as a module, choose M here: the
++ module will be called dm355evm_keys.
++
++config INPUT_BFIN_ROTARY
++ tristate "Blackfin Rotary support"
++ depends on BF54x || BF52x
++ help
++ Say Y here if you want to use the Blackfin Rotary.
++
++ To compile this driver as a module, choose M here: the
++ module will be called bfin-rotary.
++
++config INPUT_WM831X_ON
++ tristate "WM831X ON pin"
++ depends on MFD_WM831X
++ help
++ Support the ON pin of WM831X PMICs as an input device
++ reporting power button status.
++
++ To compile this driver as a module, choose M here: the module
++ will be called wm831x_on.
++
++config INPUT_PCAP
++ tristate "Motorola EZX PCAP misc input events"
++ depends on EZX_PCAP
++ help
++ Say Y here if you want to use Power key and Headphone button
++ on Motorola EZX phones.
++
++ To compile this driver as a module, choose M here: the
++ module will be called pcap_keys.
++
++endif
+diff -Nur linux-2.6.35.7.orig/drivers/input/misc/Makefile linux-2.6.35.7/drivers/input/misc/Makefile
+--- linux-2.6.35.7.orig/drivers/input/misc/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/input/misc/Makefile 2010-10-14 20:28:00.038101118 +0200
+@@ -37,4 +37,5 @@
obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
+obj-$(CONFIG_INPUT_GPIO_BUTTONS) += gpio_buttons.o
-diff -Nur linux-2.6.34.orig/drivers/leds/leds-rb750.c linux-2.6.34/drivers/leds/leds-rb750.c
---- linux-2.6.34.orig/drivers/leds/leds-rb750.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/leds/leds-rb750.c 2010-05-25 18:46:09.073472968 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/input/misc/Makefile.orig linux-2.6.35.7/drivers/input/misc/Makefile.orig
+--- linux-2.6.35.7.orig/drivers/input/misc/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/input/misc/Makefile.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,40 @@
++#
++# Makefile for the input misc drivers.
++#
++
++# Each configuration option enables a list of files.
++
++obj-$(CONFIG_INPUT_88PM860X_ONKEY) += 88pm860x_onkey.o
++obj-$(CONFIG_INPUT_AD714X) += ad714x.o
++obj-$(CONFIG_INPUT_AD714X_I2C) += ad714x-i2c.o
++obj-$(CONFIG_INPUT_AD714X_SPI) += ad714x-spi.o
++obj-$(CONFIG_INPUT_APANEL) += apanel.o
++obj-$(CONFIG_INPUT_ATI_REMOTE) += ati_remote.o
++obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o
++obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
++obj-$(CONFIG_INPUT_BFIN_ROTARY) += bfin_rotary.o
++obj-$(CONFIG_INPUT_CM109) += cm109.o
++obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o
++obj-$(CONFIG_INPUT_DM355EVM) += dm355evm_keys.o
++obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
++obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o
++obj-$(CONFIG_INPUT_KEYSPAN_REMOTE) += keyspan_remote.o
++obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o
++obj-$(CONFIG_INPUT_MAX8925_ONKEY) += max8925_onkey.o
++obj-$(CONFIG_INPUT_PCAP) += pcap_keys.o
++obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o
++obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o
++obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o
++obj-$(CONFIG_INPUT_POWERMATE) += powermate.o
++obj-$(CONFIG_INPUT_RB532_BUTTON) += rb532_button.o
++obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o
++obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o
++obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o
++obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON) += twl4030-pwrbutton.o
++obj-$(CONFIG_INPUT_TWL4030_VIBRA) += twl4030-vibra.o
++obj-$(CONFIG_INPUT_UINPUT) += uinput.o
++obj-$(CONFIG_INPUT_WINBOND_CIR) += winbond-cir.o
++obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
++obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
++obj-$(CONFIG_INPUT_YEALINK) += yealink.o
++
+diff -Nur linux-2.6.35.7.orig/drivers/leds/leds-rb750.c linux-2.6.35.7/drivers/leds/leds-rb750.c
+--- linux-2.6.35.7.orig/drivers/leds/leds-rb750.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/leds/leds-rb750.c 2010-10-14 20:28:00.074930320 +0200
@@ -0,0 +1,140 @@
+/*
+ * LED driver for the RouterBOARD 750
@@ -10820,9 +14283,9 @@ diff -Nur linux-2.6.34.orig/drivers/leds/leds-rb750.c linux-2.6.34/drivers/leds/
+MODULE_DESCRIPTION("LED driver for the RouterBOARD 750");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.34.orig/drivers/leds/leds-wndr3700-usb.c linux-2.6.34/drivers/leds/leds-wndr3700-usb.c
---- linux-2.6.34.orig/drivers/leds/leds-wndr3700-usb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/leds/leds-wndr3700-usb.c 2010-05-25 18:46:09.111217247 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/leds/leds-wndr3700-usb.c linux-2.6.35.7/drivers/leds/leds-wndr3700-usb.c
+--- linux-2.6.35.7.orig/drivers/leds/leds-wndr3700-usb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/leds/leds-wndr3700-usb.c 2010-10-14 20:28:00.116443396 +0200
@@ -0,0 +1,75 @@
+/*
+ * USB LED driver for the NETGEAR WNDR3700
@@ -10899,9 +14362,9 @@ diff -Nur linux-2.6.34.orig/drivers/leds/leds-wndr3700-usb.c linux-2.6.34/driver
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
-diff -Nur linux-2.6.34.orig/drivers/mtd/maps/ar91xx_flash.c linux-2.6.34/drivers/mtd/maps/ar91xx_flash.c
---- linux-2.6.34.orig/drivers/mtd/maps/ar91xx_flash.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/mtd/maps/ar91xx_flash.c 2010-05-25 18:46:09.152223170 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/maps/ar91xx_flash.c linux-2.6.35.7/drivers/mtd/maps/ar91xx_flash.c
+--- linux-2.6.35.7.orig/drivers/mtd/maps/ar91xx_flash.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/mtd/maps/ar91xx_flash.c 2010-10-14 20:28:00.154356608 +0200
@@ -0,0 +1,310 @@
+/*
+ * Parallel flash driver for the Atheros AR91xx SoC
@@ -11213,9 +14676,9 @@ diff -Nur linux-2.6.34.orig/drivers/mtd/maps/ar91xx_flash.c linux-2.6.34/drivers
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_DESCRIPTION("Parallel flash driver for the Atheros AR91xx SoC");
+MODULE_ALIAS("platform:" DRV_NAME);
-diff -Nur linux-2.6.34.orig/drivers/mtd/maps/Kconfig linux-2.6.34/drivers/mtd/maps/Kconfig
---- linux-2.6.34.orig/drivers/mtd/maps/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/mtd/maps/Kconfig 2010-05-25 18:46:09.183472999 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/maps/Kconfig linux-2.6.35.7/drivers/mtd/maps/Kconfig
+--- linux-2.6.35.7.orig/drivers/mtd/maps/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/mtd/maps/Kconfig 2010-10-14 20:28:00.198101134 +0200
@@ -251,6 +251,13 @@
help
Support for flash chips on NETtel/SecureEdge/SnapGear boards.
@@ -11230,9 +14693,9 @@ diff -Nur linux-2.6.34.orig/drivers/mtd/maps/Kconfig linux-2.6.34/drivers/mtd/ma
config MTD_DILNETPC
tristate "CFI Flash device mapped on DIL/Net PC"
depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
-diff -Nur linux-2.6.34.orig/drivers/mtd/maps/Makefile linux-2.6.34/drivers/mtd/maps/Makefile
---- linux-2.6.34.orig/drivers/mtd/maps/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/mtd/maps/Makefile 2010-05-25 19:02:05.812223036 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/maps/Makefile linux-2.6.35.7/drivers/mtd/maps/Makefile
+--- linux-2.6.35.7.orig/drivers/mtd/maps/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/mtd/maps/Makefile 2010-10-14 20:28:00.238101165 +0200
@@ -7,6 +7,7 @@
endif
@@ -11241,22 +14704,555 @@ diff -Nur linux-2.6.34.orig/drivers/mtd/maps/Makefile linux-2.6.34/drivers/mtd/m
obj-$(CONFIG_MTD_CDB89712) += cdb89712.o
obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o
-diff -Nur linux-2.6.34.orig/drivers/mtd/nand/Kconfig linux-2.6.34/drivers/mtd/nand/Kconfig
---- linux-2.6.34.orig/drivers/mtd/nand/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/mtd/nand/Kconfig 2010-05-25 18:46:09.253473064 +0200
-@@ -488,4 +488,8 @@
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/Kconfig linux-2.6.35.7/drivers/mtd/nand/Kconfig
+--- linux-2.6.35.7.orig/drivers/mtd/nand/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/mtd/nand/Kconfig 2010-10-14 20:28:00.288101273 +0200
+@@ -526,4 +526,8 @@
This enables the driver for the NAND Flash on evaluation board based
- on w90p910.
+ on w90p910 / NUC9xx.
+config MTD_NAND_RB4XX
+ tristate "NAND flash driver for RouterBoard 4xx series"
+ depends on MTD_NAND && AR71XX_MACH_RB4XX
+
endif # MTD_NAND
-diff -Nur linux-2.6.34.orig/drivers/mtd/nand/Makefile linux-2.6.34/drivers/mtd/nand/Makefile
---- linux-2.6.34.orig/drivers/mtd/nand/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/mtd/nand/Makefile 2010-05-25 18:46:09.291161582 +0200
-@@ -30,6 +30,7 @@
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/Kconfig.orig linux-2.6.35.7/drivers/mtd/nand/Kconfig.orig
+--- linux-2.6.35.7.orig/drivers/mtd/nand/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/mtd/nand/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,529 @@
++config MTD_NAND_ECC
++ tristate
++
++config MTD_NAND_ECC_SMC
++ bool "NAND ECC Smart Media byte order"
++ depends on MTD_NAND_ECC
++ default n
++ help
++ Software ECC according to the Smart Media Specification.
++ The original Linux implementation had byte 0 and 1 swapped.
++
++
++menuconfig MTD_NAND
++ tristate "NAND Device Support"
++ depends on MTD
++ select MTD_NAND_IDS
++ select MTD_NAND_ECC
++ help
++ This enables support for accessing all type of NAND flash
++ devices. For further information see
++ <http://www.linux-mtd.infradead.org/doc/nand.html>.
++
++if MTD_NAND
++
++config MTD_NAND_VERIFY_WRITE
++ bool "Verify NAND page writes"
++ help
++ This adds an extra check when data is written to the flash. The
++ NAND flash device internally checks only bits transitioning
++ from 1 to 0. There is a rare possibility that even though the
++ device thinks the write was successful, a bit could have been
++ flipped accidentally due to device wear or something else.
++
++config MTD_SM_COMMON
++ tristate
++ default n
++
++config MTD_NAND_MUSEUM_IDS
++ bool "Enable chip ids for obsolete ancient NAND devices"
++ depends on MTD_NAND
++ default n
++ help
++ Enable this option only when your board has first generation
++ NAND chips (page size 256 byte, erase size 4-8KiB). The IDs
++ of these chips were reused by later, larger chips.
++
++config MTD_NAND_AUTCPU12
++ tristate "SmartMediaCard on autronix autcpu12 board"
++ depends on ARCH_AUTCPU12
++ help
++ This enables the driver for the autronix autcpu12 board to
++ access the SmartMediaCard.
++
++config MTD_NAND_DENALI
++ depends on PCI
++ tristate "Support Denali NAND controller on Intel Moorestown"
++ help
++ Enable the driver for NAND flash on Intel Moorestown, using the
++ Denali NAND controller core.
++
++config MTD_NAND_DENALI_SCRATCH_REG_ADDR
++ hex "Denali NAND size scratch register address"
++ default "0xFF108018"
++ help
++ Some platforms place the NAND chip size in a scratch register
++ because (some versions of) the driver aren't able to automatically
++ determine the size of certain chips. Set the address of the
++ scratch register here to enable this feature. On Intel Moorestown
++ boards, the scratch register is at 0xFF108018.
++
++config MTD_NAND_EDB7312
++ tristate "Support for Cirrus Logic EBD7312 evaluation board"
++ depends on ARCH_EDB7312
++ help
++ This enables the driver for the Cirrus Logic EBD7312 evaluation
++ board to access the onboard NAND Flash.
++
++config MTD_NAND_H1900
++ tristate "iPAQ H1900 flash"
++ depends on ARCH_PXA && MTD_PARTITIONS
++ help
++ This enables the driver for the iPAQ h1900 flash.
++
++config MTD_NAND_GPIO
++ tristate "GPIO NAND Flash driver"
++ depends on GENERIC_GPIO && ARM
++ help
++ This enables a GPIO based NAND flash driver.
++
++config MTD_NAND_SPIA
++ tristate "NAND Flash device on SPIA board"
++ depends on ARCH_P720T
++ help
++ If you had to ask, you don't have one. Say 'N'.
++
++config MTD_NAND_AMS_DELTA
++ tristate "NAND Flash device on Amstrad E3"
++ depends on MACH_AMS_DELTA
++ help
++ Support for NAND flash on Amstrad E3 (Delta).
++
++config MTD_NAND_OMAP2
++ tristate "NAND Flash device on OMAP2 and OMAP3"
++ depends on ARM && MTD_NAND && (ARCH_OMAP2 || ARCH_OMAP3)
++ help
++ Support for NAND flash on Texas Instruments OMAP2 and OMAP3 platforms.
++
++config MTD_NAND_OMAP_PREFETCH
++ bool "GPMC prefetch support for NAND Flash device"
++ depends on MTD_NAND && MTD_NAND_OMAP2
++ default y
++ help
++ The NAND device can be accessed for Read/Write using GPMC PREFETCH engine
++ to improve the performance.
++
++config MTD_NAND_OMAP_PREFETCH_DMA
++ depends on MTD_NAND_OMAP_PREFETCH
++ bool "DMA mode"
++ default n
++ help
++ The GPMC PREFETCH engine can be configured eigther in MPU interrupt mode
++ or in DMA interrupt mode.
++ Say y for DMA mode or MPU mode will be used
++
++config MTD_NAND_IDS
++ tristate
++
++config MTD_NAND_RICOH
++ tristate "Ricoh xD card reader"
++ default n
++ depends on PCI
++ select MTD_SM_COMMON
++ help
++ Enable support for Ricoh R5C852 xD card reader
++ You also need to enable ether
++ NAND SSFDC (SmartMedia) read only translation layer' or new
++ expermental, readwrite
++ 'SmartMedia/xD new translation layer'
++
++config MTD_NAND_AU1550
++ tristate "Au1550/1200 NAND support"
++ depends on SOC_AU1200 || SOC_AU1550
++ help
++ This enables the driver for the NAND flash controller on the
++ AMD/Alchemy 1550 SOC.
++
++config MTD_NAND_BF5XX
++ tristate "Blackfin on-chip NAND Flash Controller driver"
++ depends on (BF54x || BF52x) && MTD_NAND
++ help
++ This enables the Blackfin on-chip NAND flash controller
++
++ No board specific support is done by this driver, each board
++ must advertise a platform_device for the driver to attach.
++
++ This driver can also be built as a module. If so, the module
++ will be called bf5xx-nand.
++
++config MTD_NAND_BF5XX_HWECC
++ bool "BF5XX NAND Hardware ECC"
++ default y
++ depends on MTD_NAND_BF5XX
++ help
++ Enable the use of the BF5XX's internal ECC generator when
++ using NAND.
++
++config MTD_NAND_BF5XX_BOOTROM_ECC
++ bool "Use Blackfin BootROM ECC Layout"
++ default n
++ depends on MTD_NAND_BF5XX_HWECC
++ help
++ If you wish to modify NAND pages and allow the Blackfin on-chip
++ BootROM to boot from them, say Y here. This is only necessary
++ if you are booting U-Boot out of NAND and you wish to update
++ U-Boot from Linux' userspace. Otherwise, you should say N here.
++
++ If unsure, say N.
++
++config MTD_NAND_RTC_FROM4
++ tristate "Renesas Flash ROM 4-slot interface board (FROM_BOARD4)"
++ depends on SH_SOLUTION_ENGINE
++ select REED_SOLOMON
++ select REED_SOLOMON_DEC8
++ select BITREVERSE
++ help
++ This enables the driver for the Renesas Technology AG-AND
++ flash interface board (FROM_BOARD4)
++
++config MTD_NAND_PPCHAMELEONEVB
++ tristate "NAND Flash device on PPChameleonEVB board"
++ depends on PPCHAMELEONEVB && BROKEN
++ help
++ This enables the NAND flash driver on the PPChameleon EVB Board.
++
++config MTD_NAND_S3C2410
++ tristate "NAND Flash support for Samsung S3C SoCs"
++ depends on ARCH_S3C2410 || ARCH_S3C64XX
++ help
++ This enables the NAND flash controller on the S3C24xx and S3C64xx
++ SoCs
++
++ No board specific support is done by this driver, each board
++ must advertise a platform_device for the driver to attach.
++
++config MTD_NAND_S3C2410_DEBUG
++ bool "Samsung S3C NAND driver debug"
++ depends on MTD_NAND_S3C2410
++ help
++ Enable debugging of the S3C NAND driver
++
++config MTD_NAND_S3C2410_HWECC
++ bool "Samsung S3C NAND Hardware ECC"
++ depends on MTD_NAND_S3C2410
++ help
++ Enable the use of the controller's internal ECC generator when
++ using NAND. Early versions of the chips have had problems with
++ incorrect ECC generation, and if using these, the default of
++ software ECC is preferable.
++
++config MTD_NAND_NDFC
++ tristate "NDFC NanD Flash Controller"
++ depends on 4xx
++ select MTD_NAND_ECC_SMC
++ help
++ NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
++
++config MTD_NAND_S3C2410_CLKSTOP
++ bool "Samsung S3C NAND IDLE clock stop"
++ depends on MTD_NAND_S3C2410
++ default n
++ help
++ Stop the clock to the NAND controller when there is no chip
++ selected to save power. This will mean there is a small delay
++ when the is NAND chip selected or released, but will save
++ approximately 5mA of power when there is nothing happening.
++
++config MTD_NAND_BCM_UMI
++ tristate "NAND Flash support for BCM Reference Boards"
++ depends on ARCH_BCMRING && MTD_NAND
++ help
++ This enables the NAND flash controller on the BCM UMI block.
++
++ No board specfic support is done by this driver, each board
++ must advertise a platform_device for the driver to attach.
++
++config MTD_NAND_BCM_UMI_HWCS
++ bool "BCM UMI NAND Hardware CS"
++ depends on MTD_NAND_BCM_UMI
++ help
++ Enable the use of the BCM UMI block's internal CS using NAND.
++ This should only be used if you know the external NAND CS can toggle.
++
++config MTD_NAND_DISKONCHIP
++ tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
++ depends on EXPERIMENTAL
++ select REED_SOLOMON
++ select REED_SOLOMON_DEC16
++ help
++ This is a reimplementation of M-Systems DiskOnChip 2000,
++ Millennium and Millennium Plus as a standard NAND device driver,
++ as opposed to the earlier self-contained MTD device drivers.
++ This should enable, among other things, proper JFFS2 operation on
++ these devices.
++
++config MTD_NAND_DISKONCHIP_PROBE_ADVANCED
++ bool "Advanced detection options for DiskOnChip"
++ depends on MTD_NAND_DISKONCHIP
++ help
++ This option allows you to specify nonstandard address at which to
++ probe for a DiskOnChip, or to change the detection options. You
++ are unlikely to need any of this unless you are using LinuxBIOS.
++ Say 'N'.
++
++config MTD_NAND_DISKONCHIP_PROBE_ADDRESS
++ hex "Physical address of DiskOnChip" if MTD_NAND_DISKONCHIP_PROBE_ADVANCED
++ depends on MTD_NAND_DISKONCHIP
++ default "0"
++ ---help---
++ By default, the probe for DiskOnChip devices will look for a
++ DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
++ This option allows you to specify a single address at which to probe
++ for the device, which is useful if you have other devices in that
++ range which get upset when they are probed.
++
++ (Note that on PowerPC, the normal probe will only check at
++ 0xE4000000.)
++
++ Normally, you should leave this set to zero, to allow the probe at
++ the normal addresses.
++
++config MTD_NAND_DISKONCHIP_PROBE_HIGH
++ bool "Probe high addresses"
++ depends on MTD_NAND_DISKONCHIP_PROBE_ADVANCED
++ help
++ By default, the probe for DiskOnChip devices will look for a
++ DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
++ This option changes to make it probe between 0xFFFC8000 and
++ 0xFFFEE000. Unless you are using LinuxBIOS, this is unlikely to be
++ useful to you. Say 'N'.
++
++config MTD_NAND_DISKONCHIP_BBTWRITE
++ bool "Allow BBT writes on DiskOnChip Millennium and 2000TSOP"
++ depends on MTD_NAND_DISKONCHIP
++ help
++ On DiskOnChip devices shipped with the INFTL filesystem (Millennium
++ and 2000 TSOP/Alon), Linux reserves some space at the end of the
++ device for the Bad Block Table (BBT). If you have existing INFTL
++ data on your device (created by non-Linux tools such as M-Systems'
++ DOS drivers), your data might overlap the area Linux wants to use for
++ the BBT. If this is a concern for you, leave this option disabled and
++ Linux will not write BBT data into this area.
++ The downside of leaving this option disabled is that if bad blocks
++ are detected by Linux, they will not be recorded in the BBT, which
++ could cause future problems.
++ Once you enable this option, new filesystems (INFTL or others, created
++ in Linux or other operating systems) will not use the reserved area.
++ The only reason not to enable this option is to prevent damage to
++ preexisting filesystems.
++ Even if you leave this disabled, you can enable BBT writes at module
++ load time (assuming you build diskonchip as a module) with the module
++ parameter "inftl_bbt_write=1".
++
++config MTD_NAND_SHARPSL
++ tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
++ depends on ARCH_PXA
++
++config MTD_NAND_CAFE
++ tristate "NAND support for OLPC CAFÉ chip"
++ depends on PCI
++ select REED_SOLOMON
++ select REED_SOLOMON_DEC16
++ help
++ Use NAND flash attached to the CAFÉ chip designed for the OLPC
++ laptop.
++
++config MTD_NAND_CS553X
++ tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
++ depends on X86_32
++ help
++ The CS553x companion chips for the AMD Geode processor
++ include NAND flash controllers with built-in hardware ECC
++ capabilities; enabling this option will allow you to use
++ these. The driver will check the MSRs to verify that the
++ controller is enabled for NAND, and currently requires that
++ the controller be in MMIO mode.
++
++ If you say "m", the module will be called cs553x_nand.
++
++config MTD_NAND_ATMEL
++ tristate "Support for NAND Flash / SmartMedia on AT91 and AVR32"
++ depends on ARCH_AT91 || AVR32
++ help
++ Enables support for NAND Flash / Smart Media Card interface
++ on Atmel AT91 and AVR32 processors.
++choice
++ prompt "ECC management for NAND Flash / SmartMedia on AT91 / AVR32"
++ depends on MTD_NAND_ATMEL
++
++config MTD_NAND_ATMEL_ECC_HW
++ bool "Hardware ECC"
++ depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9260 || AVR32
++ help
++ Use hardware ECC instead of software ECC when the chip
++ supports it.
++
++ The hardware ECC controller is capable of single bit error
++ correction and 2-bit random detection per page.
++
++ NB : hardware and software ECC schemes are incompatible.
++ If you switch from one to another, you'll have to erase your
++ mtd partition.
++
++ If unsure, say Y
++
++config MTD_NAND_ATMEL_ECC_SOFT
++ bool "Software ECC"
++ help
++ Use software ECC.
++
++ NB : hardware and software ECC schemes are incompatible.
++ If you switch from one to another, you'll have to erase your
++ mtd partition.
++
++config MTD_NAND_ATMEL_ECC_NONE
++ bool "No ECC (testing only, DANGEROUS)"
++ depends on DEBUG_KERNEL
++ help
++ No ECC will be used.
++ It's not a good idea and it should be reserved for testing
++ purpose only.
++
++ If unsure, say N
++
++endchoice
++
++config MTD_NAND_PXA3xx
++ tristate "Support for NAND flash devices on PXA3xx"
++ depends on MTD_NAND && (PXA3xx || ARCH_MMP)
++ help
++ This enables the driver for the NAND flash device found on
++ PXA3xx processors
++
++config MTD_NAND_PXA3xx_BUILTIN
++ bool "Use builtin definitions for some NAND chips (deprecated)"
++ depends on MTD_NAND_PXA3xx
++ help
++ This enables builtin definitions for some NAND chips. This
++ is deprecated in favor of platform specific data.
++
++config MTD_NAND_CM_X270
++ tristate "Support for NAND Flash on CM-X270 modules"
++ depends on MTD_NAND && MACH_ARMCORE
++
++config MTD_NAND_PASEMI
++ tristate "NAND support for PA Semi PWRficient"
++ depends on MTD_NAND && PPC_PASEMI
++ help
++ Enables support for NAND Flash interface on PA Semi PWRficient
++ based boards
++
++config MTD_NAND_TMIO
++ tristate "NAND Flash device on Toshiba Mobile IO Controller"
++ depends on MTD_NAND && MFD_TMIO
++ help
++ Support for NAND flash connected to a Toshiba Mobile IO
++ Controller in some PDAs, including the Sharp SL6000x.
++
++config MTD_NAND_NANDSIM
++ tristate "Support for NAND Flash Simulator"
++ depends on MTD_PARTITIONS
++ help
++ The simulator may simulate various NAND flash chips for the
++ MTD nand layer.
++
++config MTD_NAND_PLATFORM
++ tristate "Support for generic platform NAND driver"
++ depends on MTD_NAND
++ help
++ This implements a generic NAND driver for on-SOC platform
++ devices. You will need to provide platform-specific functions
++ via platform_data.
++
++config MTD_ALAUDA
++ tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1"
++ depends on MTD_NAND && USB
++ help
++ These two (and possibly other) Alauda-based cardreaders for
++ SmartMedia and xD allow raw flash access.
++
++config MTD_NAND_ORION
++ tristate "NAND Flash support for Marvell Orion SoC"
++ depends on PLAT_ORION && MTD_NAND
++ help
++ This enables the NAND flash controller on Orion machines.
++
++ No board specific support is done by this driver, each board
++ must advertise a platform_device for the driver to attach.
++
++config MTD_NAND_FSL_ELBC
++ tristate "NAND support for Freescale eLBC controllers"
++ depends on MTD_NAND && PPC_OF
++ help
++ Various Freescale chips, including the 8313, include a NAND Flash
++ Controller Module with built-in hardware ECC capabilities.
++ Enabling this option will enable you to use this to control
++ external NAND devices.
++
++config MTD_NAND_FSL_UPM
++ tristate "Support for NAND on Freescale UPM"
++ depends on MTD_NAND && (PPC_83xx || PPC_85xx)
++ select FSL_LBC
++ help
++ Enables support for NAND Flash chips wired onto Freescale PowerPC
++ processor localbus with User-Programmable Machine support.
++
++config MTD_NAND_MPC5121_NFC
++ tristate "MPC5121 built-in NAND Flash Controller support"
++ depends on PPC_MPC512x
++ help
++ This enables the driver for the NAND flash controller on the
++ MPC5121 SoC.
++
++config MTD_NAND_MXC
++ tristate "MXC NAND support"
++ depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3
++ help
++ This enables the driver for the NAND flash controller on the
++ MXC processors.
++
++config MTD_NAND_NOMADIK
++ tristate "ST Nomadik 8815 NAND support"
++ depends on ARCH_NOMADIK
++ help
++ Driver for the NAND flash controller on the Nomadik, with ECC.
++
++config MTD_NAND_SH_FLCTL
++ tristate "Support for NAND on Renesas SuperH FLCTL"
++ depends on MTD_NAND && (SUPERH || ARCH_SHMOBILE)
++ help
++ Several Renesas SuperH CPU has FLCTL. This option enables support
++ for NAND Flash using FLCTL.
++
++config MTD_NAND_DAVINCI
++ tristate "Support NAND on DaVinci SoC"
++ depends on ARCH_DAVINCI
++ help
++ Enable the driver for NAND flash chips on Texas Instruments
++ DaVinci processors.
++
++config MTD_NAND_TXX9NDFMC
++ tristate "NAND Flash support for TXx9 SoC"
++ depends on SOC_TX4938 || SOC_TX4939
++ help
++ This enables the NAND flash controller on the TXx9 SoCs.
++
++config MTD_NAND_SOCRATES
++ tristate "Support for NAND on Socrates board"
++ depends on MTD_NAND && SOCRATES
++ help
++ Enables support for NAND Flash chips wired onto Socrates board.
++
++config MTD_NAND_NUC900
++ tristate "Support for NAND on Nuvoton NUC9xx/w90p910 evaluation boards."
++ depends on ARCH_W90X900 && MTD_PARTITIONS
++ help
++ This enables the driver for the NAND Flash on evaluation board based
++ on w90p910 / NUC9xx.
++
++endif # MTD_NAND
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/Makefile linux-2.6.35.7/drivers/mtd/nand/Makefile
+--- linux-2.6.35.7.orig/drivers/mtd/nand/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/mtd/nand/Makefile 2010-10-14 20:28:00.318093945 +0200
+@@ -32,6 +32,7 @@
obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o
obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
@@ -11264,9 +15260,63 @@ diff -Nur linux-2.6.34.orig/drivers/mtd/nand/Makefile linux-2.6.34/drivers/mtd/n
obj-$(CONFIG_MTD_ALAUDA) += alauda.o
obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o
obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o
-diff -Nur linux-2.6.34.orig/drivers/mtd/nand/rb4xx_nand.c linux-2.6.34/drivers/mtd/nand/rb4xx_nand.c
---- linux-2.6.34.orig/drivers/mtd/nand/rb4xx_nand.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/mtd/nand/rb4xx_nand.c 2010-05-25 19:20:29.870979934 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/Makefile.orig linux-2.6.35.7/drivers/mtd/nand/Makefile.orig
+--- linux-2.6.35.7.orig/drivers/mtd/nand/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/mtd/nand/Makefile.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,50 @@
++#
++# linux/drivers/nand/Makefile
++#
++
++obj-$(CONFIG_MTD_NAND) += nand.o
++obj-$(CONFIG_MTD_NAND_ECC) += nand_ecc.o
++obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o
++obj-$(CONFIG_MTD_SM_COMMON) += sm_common.o
++
++obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o
++obj-$(CONFIG_MTD_NAND_SPIA) += spia.o
++obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o
++obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o
++obj-$(CONFIG_MTD_NAND_DENALI) += denali.o
++obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o
++obj-$(CONFIG_MTD_NAND_AU1550) += au1550nd.o
++obj-$(CONFIG_MTD_NAND_BF5XX) += bf5xx_nand.o
++obj-$(CONFIG_MTD_NAND_PPCHAMELEONEVB) += ppchameleonevb.o
++obj-$(CONFIG_MTD_NAND_S3C2410) += s3c2410.o
++obj-$(CONFIG_MTD_NAND_DAVINCI) += davinci_nand.o
++obj-$(CONFIG_MTD_NAND_DISKONCHIP) += diskonchip.o
++obj-$(CONFIG_MTD_NAND_H1900) += h1910.o
++obj-$(CONFIG_MTD_NAND_RTC_FROM4) += rtc_from4.o
++obj-$(CONFIG_MTD_NAND_SHARPSL) += sharpsl.o
++obj-$(CONFIG_MTD_NAND_NANDSIM) += nandsim.o
++obj-$(CONFIG_MTD_NAND_CS553X) += cs553x_nand.o
++obj-$(CONFIG_MTD_NAND_NDFC) += ndfc.o
++obj-$(CONFIG_MTD_NAND_ATMEL) += atmel_nand.o
++obj-$(CONFIG_MTD_NAND_GPIO) += gpio.o
++obj-$(CONFIG_MTD_NAND_OMAP2) += omap2.o
++obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270_nand.o
++obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o
++obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
++obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
++obj-$(CONFIG_MTD_ALAUDA) += alauda.o
++obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o
++obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o
++obj-$(CONFIG_MTD_NAND_FSL_ELBC) += fsl_elbc_nand.o
++obj-$(CONFIG_MTD_NAND_FSL_UPM) += fsl_upm.o
++obj-$(CONFIG_MTD_NAND_SH_FLCTL) += sh_flctl.o
++obj-$(CONFIG_MTD_NAND_MXC) += mxc_nand.o
++obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o
++obj-$(CONFIG_MTD_NAND_TXX9NDFMC) += txx9ndfmc.o
++obj-$(CONFIG_MTD_NAND_NUC900) += nuc900_nand.o
++obj-$(CONFIG_MTD_NAND_NOMADIK) += nomadik_nand.o
++obj-$(CONFIG_MTD_NAND_BCM_UMI) += bcm_umi_nand.o nand_bcm_umi.o
++obj-$(CONFIG_MTD_NAND_MPC5121_NFC) += mpc5121_nfc.o
++obj-$(CONFIG_MTD_NAND_RICOH) += r852.o
++
++nand-objs := nand_base.o nand_bbt.o
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/rb4xx_nand.c linux-2.6.35.7/drivers/mtd/nand/rb4xx_nand.c
+--- linux-2.6.35.7.orig/drivers/mtd/nand/rb4xx_nand.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/mtd/nand/rb4xx_nand.c 2010-10-14 20:28:34.515600563 +0200
@@ -0,0 +1,513 @@
+/*
+ * NAND flash driver for the MikroTik RouterBoard 4xx series
@@ -11706,7 +15756,7 @@ diff -Nur linux-2.6.34.orig/drivers/mtd/nand/rb4xx_nand.c linux-2.6.34/drivers/m
+
+ platform_set_drvdata(pdev, info);
+
-+ ret = nand_scan_ident(&info->mtd, 1);
++ ret = nand_scan_ident(&info->mtd, 1, NULL);
+ if (ret) {
+ ret = -ENXIO;
+ goto err_free_info;
@@ -11781,9 +15831,9 @@ diff -Nur linux-2.6.34.orig/drivers/mtd/nand/rb4xx_nand.c linux-2.6.34/drivers/m
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.34.orig/drivers/mtd/nand/rb750_nand.c linux-2.6.34/drivers/mtd/nand/rb750_nand.c
---- linux-2.6.34.orig/drivers/mtd/nand/rb750_nand.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/mtd/nand/rb750_nand.c 2010-05-25 18:46:09.381633487 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/nand/rb750_nand.c linux-2.6.35.7/drivers/mtd/nand/rb750_nand.c
+--- linux-2.6.35.7.orig/drivers/mtd/nand/rb750_nand.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/mtd/nand/rb750_nand.c 2010-10-14 20:28:00.398101127 +0200
@@ -0,0 +1,360 @@
+/*
+ * NAND flash driver for the MikroTik RouterBOARD 750
@@ -12145,9 +16195,9 @@ diff -Nur linux-2.6.34.orig/drivers/mtd/nand/rb750_nand.c linux-2.6.34/drivers/m
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.34.orig/drivers/mtd/wrt160nl_part.c linux-2.6.34/drivers/mtd/wrt160nl_part.c
---- linux-2.6.34.orig/drivers/mtd/wrt160nl_part.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/mtd/wrt160nl_part.c 2010-05-25 18:46:09.413464327 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/mtd/wrt160nl_part.c linux-2.6.35.7/drivers/mtd/wrt160nl_part.c
+--- linux-2.6.35.7.orig/drivers/mtd/wrt160nl_part.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/mtd/wrt160nl_part.c 2010-10-14 20:28:00.438101171 +0200
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2009 Christian Daniel <cd@maintech.de>
@@ -12330,9 +16380,9 @@ diff -Nur linux-2.6.34.orig/drivers/mtd/wrt160nl_part.c linux-2.6.34/drivers/mtd
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Daniel <cd@maintech.de>");
-diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_ar8216.c linux-2.6.34/drivers/net/ag71xx/ag71xx_ar8216.c
---- linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_ar8216.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/net/ag71xx/ag71xx_ar8216.c 2010-05-25 18:46:09.453464158 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_ar8216.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_ar8216.c
+--- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_ar8216.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_ar8216.c 2010-10-14 20:28:00.478101179 +0200
@@ -0,0 +1,44 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -12378,9 +16428,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_ar8216.c linux-2.6.34/driv
+ skb_pull(skb, AR8216_HEADER_LEN);
+ return 0;
+}
-diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_debugfs.c linux-2.6.34/drivers/net/ag71xx/ag71xx_debugfs.c
---- linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_debugfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/net/ag71xx/ag71xx_debugfs.c 2010-05-25 18:46:09.493464124 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_debugfs.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_debugfs.c
+--- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_debugfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_debugfs.c 2010-10-14 20:28:00.514356373 +0200
@@ -0,0 +1,197 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -12579,9 +16629,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_debugfs.c linux-2.6.34/dri
+ debugfs_remove(ag71xx_debugfs_root);
+ ag71xx_debugfs_root = NULL;
+}
-diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_ethtool.c linux-2.6.34/drivers/net/ag71xx/ag71xx_ethtool.c
---- linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_ethtool.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/net/ag71xx/ag71xx_ethtool.c 2010-05-25 18:46:09.523473138 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_ethtool.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_ethtool.c
+--- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_ethtool.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_ethtool.c 2010-10-14 20:28:00.558101160 +0200
@@ -0,0 +1,71 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -12654,9 +16704,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_ethtool.c linux-2.6.34/dri
+ .set_msglevel = ag71xx_ethtool_set_msglevel,
+ .get_link = ethtool_op_get_link,
+};
-diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx.h linux-2.6.34/drivers/net/ag71xx/ag71xx.h
---- linux-2.6.34.orig/drivers/net/ag71xx/ag71xx.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/net/ag71xx/ag71xx.h 2010-05-25 18:46:09.553473141 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx.h linux-2.6.35.7/drivers/net/ag71xx/ag71xx.h
+--- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx.h 2010-10-14 20:28:00.594356402 +0200
@@ -0,0 +1,500 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -13158,9 +17208,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx.h linux-2.6.34/drivers/net
+#endif /* CONFIG_AG71XX_DEBUG_FS */
+
+#endif /* _AG71XX_H */
-diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_main.c linux-2.6.34/drivers/net/ag71xx/ag71xx_main.c
---- linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_main.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/net/ag71xx/ag71xx_main.c 2010-05-25 18:46:09.593464126 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_main.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_main.c
+--- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_main.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_main.c 2010-10-14 20:28:00.638101269 +0200
@@ -0,0 +1,1184 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -14346,9 +18396,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_main.c linux-2.6.34/driver
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" AG71XX_DRV_NAME);
-diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_mdio.c linux-2.6.34/drivers/net/ag71xx/ag71xx_mdio.c
---- linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_mdio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/net/ag71xx/ag71xx_mdio.c 2010-05-25 18:46:09.633464081 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_mdio.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_mdio.c
+--- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_mdio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_mdio.c 2010-10-14 20:28:00.678101104 +0200
@@ -0,0 +1,243 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -14593,9 +18643,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_mdio.c linux-2.6.34/driver
+{
+ platform_driver_unregister(&ag71xx_mdio_driver);
+}
-diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_phy.c linux-2.6.34/drivers/net/ag71xx/ag71xx_phy.c
---- linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_phy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/net/ag71xx/ag71xx_phy.c 2010-05-25 18:46:09.663473144 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_phy.c linux-2.6.35.7/drivers/net/ag71xx/ag71xx_phy.c
+--- linux-2.6.35.7.orig/drivers/net/ag71xx/ag71xx_phy.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/ag71xx/ag71xx_phy.c 2010-10-14 20:28:00.708092093 +0200
@@ -0,0 +1,213 @@
+/*
+ * Atheros AR71xx built-in ethernet mac driver
@@ -14810,9 +18860,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/ag71xx_phy.c linux-2.6.34/drivers
+ if (ag->phy_dev)
+ phy_disconnect(ag->phy_dev);
+}
-diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/Kconfig linux-2.6.34/drivers/net/ag71xx/Kconfig
---- linux-2.6.34.orig/drivers/net/ag71xx/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/net/ag71xx/Kconfig 2010-05-25 18:46:09.693473072 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/Kconfig linux-2.6.35.7/drivers/net/ag71xx/Kconfig
+--- linux-2.6.35.7.orig/drivers/net/ag71xx/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/ag71xx/Kconfig 2010-10-14 20:28:00.748098810 +0200
@@ -0,0 +1,33 @@
+config AG71XX
+ tristate "Atheros AR71xx built-in ethernet mac support"
@@ -14847,9 +18897,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/Kconfig linux-2.6.34/drivers/net/
+ Atheros AR8216 switch found on some boards.
+
+endif
-diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/Makefile linux-2.6.34/drivers/net/ag71xx/Makefile
---- linux-2.6.34.orig/drivers/net/ag71xx/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/net/ag71xx/Makefile 2010-05-25 18:46:09.733464200 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/ag71xx/Makefile linux-2.6.35.7/drivers/net/ag71xx/Makefile
+--- linux-2.6.35.7.orig/drivers/net/ag71xx/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/ag71xx/Makefile 2010-10-14 20:28:00.784356250 +0200
@@ -0,0 +1,14 @@
+#
+# Makefile for the Atheros AR71xx built-in ethernet macs
@@ -14865,10 +18915,10 @@ diff -Nur linux-2.6.34.orig/drivers/net/ag71xx/Makefile linux-2.6.34/drivers/net
+
+obj-$(CONFIG_AG71XX) += ag71xx.o
+
-diff -Nur linux-2.6.34.orig/drivers/net/Kconfig linux-2.6.34/drivers/net/Kconfig
---- linux-2.6.34.orig/drivers/net/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/net/Kconfig 2010-05-25 18:46:09.773464179 +0200
-@@ -2038,6 +2038,8 @@
+diff -Nur linux-2.6.35.7.orig/drivers/net/Kconfig linux-2.6.35.7/drivers/net/Kconfig
+--- linux-2.6.35.7.orig/drivers/net/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/net/Kconfig 2010-10-14 20:28:00.828101196 +0200
+@@ -2032,6 +2032,8 @@
The safe and default value for this is N.
@@ -14877,9 +18927,3327 @@ diff -Nur linux-2.6.34.orig/drivers/net/Kconfig linux-2.6.34/drivers/net/Kconfig
config DL2K
tristate "DL2000/TC902x-based Gigabit Ethernet support"
depends on PCI
-diff -Nur linux-2.6.34.orig/drivers/net/Makefile linux-2.6.34/drivers/net/Makefile
---- linux-2.6.34.orig/drivers/net/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/net/Makefile 2010-05-25 18:46:09.813473236 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/Kconfig.orig linux-2.6.35.7/drivers/net/Kconfig.orig
+--- linux-2.6.35.7.orig/drivers/net/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,3314 @@
++#
++# Network device configuration
++#
++
++menuconfig NETDEVICES
++ default y if UML
++ depends on NET
++ bool "Network device support"
++ ---help---
++ You can say N here if you don't intend to connect your Linux box to
++ any other computer at all.
++
++ You'll have to say Y if your computer contains a network card that
++ you want to use under Linux. If you are going to run SLIP or PPP over
++ telephone line or null modem cable you need say Y here. Connecting
++ two machines with parallel ports using PLIP needs this, as well as
++ AX.25/KISS for sending Internet traffic over amateur radio links.
++
++ See also "The Linux Network Administrator's Guide" by Olaf Kirch and
++ Terry Dawson. Available at <http://www.tldp.org/guides.html>.
++
++ If unsure, say Y.
++
++# All the following symbols are dependent on NETDEVICES - do not repeat
++# that for each of the symbols.
++if NETDEVICES
++
++config IFB
++ tristate "Intermediate Functional Block support"
++ depends on NET_CLS_ACT
++ ---help---
++ This is an intermediate driver that allows sharing of
++ resources.
++ To compile this driver as a module, choose M here: the module
++ will be called ifb. If you want to use more than one ifb
++ device at a time, you need to compile this driver as a module.
++ Instead of 'ifb', the devices will then be called 'ifb0',
++ 'ifb1' etc.
++ Look at the iproute2 documentation directory for usage etc
++
++config DUMMY
++ tristate "Dummy net driver support"
++ ---help---
++ This is essentially a bit-bucket device (i.e. traffic you send to
++ this device is consigned into oblivion) with a configurable IP
++ address. It is most commonly used in order to make your currently
++ inactive SLIP address seem like a real address for local programs.
++ If you use SLIP or PPP, you might want to say Y here. Since this
++ thing often comes in handy, the default is Y. It won't enlarge your
++ kernel either. What a deal. Read about it in the Network
++ Administrator's Guide, available from
++ <http://www.tldp.org/docs.html#guide>.
++
++ To compile this driver as a module, choose M here: the module
++ will be called dummy. If you want to use more than one dummy
++ device at a time, you need to compile this driver as a module.
++ Instead of 'dummy', the devices will then be called 'dummy0',
++ 'dummy1' etc.
++
++config BONDING
++ tristate "Bonding driver support"
++ depends on INET
++ depends on IPV6 || IPV6=n
++ ---help---
++ Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
++ Channels together. This is called 'Etherchannel' by Cisco,
++ 'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.
++
++ The driver supports multiple bonding modes to allow for both high
++ performance and high availability operation.
++
++ Refer to <file:Documentation/networking/bonding.txt> for more
++ information.
++
++ To compile this driver as a module, choose M here: the module
++ will be called bonding.
++
++config MACVLAN
++ tristate "MAC-VLAN support (EXPERIMENTAL)"
++ depends on EXPERIMENTAL
++ ---help---
++ This allows one to create virtual interfaces that map packets to
++ or from specific MAC addresses to a particular interface.
++
++ Macvlan devices can be added using the "ip" command from the
++ iproute2 package starting with the iproute2-2.6.23 release:
++
++ "ip link add link <real dev> [ address MAC ] [ NAME ] type macvlan"
++
++ To compile this driver as a module, choose M here: the module
++ will be called macvlan.
++
++config MACVTAP
++ tristate "MAC-VLAN based tap driver (EXPERIMENTAL)"
++ depends on MACVLAN
++ help
++ This adds a specialized tap character device driver that is based
++ on the MAC-VLAN network interface, called macvtap. A macvtap device
++ can be added in the same way as a macvlan device, using 'type
++ macvlan', and then be accessed through the tap user space interface.
++
++ To compile this driver as a module, choose M here: the module
++ will be called macvtap.
++
++config EQUALIZER
++ tristate "EQL (serial line load balancing) support"
++ ---help---
++ If you have two serial connections to some other computer (this
++ usually requires two modems and two telephone lines) and you use
++ SLIP (the protocol for sending Internet traffic over telephone
++ lines) or PPP (a better SLIP) on them, you can make them behave like
++ one double speed connection using this driver. Naturally, this has
++ to be supported at the other end as well, either with a similar EQL
++ Linux driver or with a Livingston Portmaster 2e.
++
++ Say Y if you want this and read
++ <file:Documentation/networking/eql.txt>. You may also want to read
++ section 6.2 of the NET-3-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here: the module
++ will be called eql. If unsure, say N.
++
++config TUN
++ tristate "Universal TUN/TAP device driver support"
++ select CRC32
++ ---help---
++ TUN/TAP provides packet reception and transmission for user space
++ programs. It can be viewed as a simple Point-to-Point or Ethernet
++ device, which instead of receiving packets from a physical media,
++ receives them from user space program and instead of sending packets
++ via physical media writes them to the user space program.
++
++ When a program opens /dev/net/tun, driver creates and registers
++ corresponding net device tunX or tapX. After a program closed above
++ devices, driver will automatically delete tunXX or tapXX device and
++ all routes corresponding to it.
++
++ Please read <file:Documentation/networking/tuntap.txt> for more
++ information.
++
++ To compile this driver as a module, choose M here: the module
++ will be called tun.
++
++ If you don't know what to use this for, you don't need it.
++
++config VETH
++ tristate "Virtual ethernet pair device"
++ ---help---
++ This device is a local ethernet tunnel. Devices are created in pairs.
++ When one end receives the packet it appears on its pair and vice
++ versa.
++
++config NET_SB1000
++ tristate "General Instruments Surfboard 1000"
++ depends on PNP
++ ---help---
++ This is a driver for the General Instrument (also known as
++ NextLevel) SURFboard 1000 internal
++ cable modem. This is an ISA card which is used by a number of cable
++ TV companies to provide cable modem access. It's a one-way
++ downstream-only cable modem, meaning that your upstream net link is
++ provided by your regular phone modem.
++
++ At present this driver only compiles as a module, so say M here if
++ you have this card. The module will be called sb1000. Then read
++ <file:Documentation/networking/README.sb1000> for information on how
++ to use this module, as it needs special ppp scripts for establishing
++ a connection. Further documentation and the necessary scripts can be
++ found at:
++
++ <http://www.jacksonville.net/~fventuri/>
++ <http://home.adelphia.net/~siglercm/sb1000.html>
++ <http://linuxpower.cx/~cable/>
++
++ If you don't have this card, of course say N.
++
++source "drivers/net/arcnet/Kconfig"
++
++source "drivers/net/phy/Kconfig"
++
++#
++# Ethernet
++#
++
++menuconfig NET_ETHERNET
++ bool "Ethernet (10 or 100Mbit)"
++ depends on !UML
++ ---help---
++ Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
++ type of Local Area Network (LAN) in universities and companies.
++
++ Common varieties of Ethernet are: 10BASE-2 or Thinnet (10 Mbps over
++ coaxial cable, linking computers in a chain), 10BASE-T or twisted
++ pair (10 Mbps over twisted pair cable, linking computers to central
++ hubs), 10BASE-F (10 Mbps over optical fiber links, using hubs),
++ 100BASE-TX (100 Mbps over two twisted pair cables, using hubs),
++ 100BASE-T4 (100 Mbps over 4 standard voice-grade twisted pair
++ cables, using hubs), 100BASE-FX (100 Mbps over optical fiber links)
++ [the 100BASE varieties are also known as Fast Ethernet], and Gigabit
++ Ethernet (1 Gbps over optical fiber or short copper links).
++
++ If your Linux machine will be connected to an Ethernet and you have
++ an Ethernet network interface card (NIC) installed in your computer,
++ say Y here and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>. You will then also have
++ to say Y to the driver for your particular NIC.
++
++ Note that the answer to this question won't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the questions about Ethernet network cards. If unsure, say N.
++
++if NET_ETHERNET
++
++config MII
++ tristate "Generic Media Independent Interface device support"
++ help
++ Most ethernet controllers have MII transceiver either as an external
++ or internal device. It is safe to say Y or M here even if your
++ ethernet card lack MII.
++
++config MACB
++ tristate "Atmel MACB support"
++ depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9
++ select PHYLIB
++ help
++ The Atmel MACB ethernet interface is found on many AT32 and AT91
++ parts. Say Y to include support for the MACB chip.
++
++ To compile this driver as a module, choose M here: the module
++ will be called macb.
++
++source "drivers/net/arm/Kconfig"
++
++config AX88796
++ tristate "ASIX AX88796 NE2000 clone support"
++ depends on ARM || MIPS || SUPERH
++ select CRC32
++ select MII
++ help
++ AX88796 driver, using platform bus to provide
++ chip detection and resources
++
++config AX88796_93CX6
++ bool "ASIX AX88796 external 93CX6 eeprom support"
++ depends on AX88796
++ select EEPROM_93CX6
++ help
++ Select this if your platform comes with an external 93CX6 eeprom.
++
++config MACE
++ tristate "MACE (Power Mac ethernet) support"
++ depends on PPC_PMAC && PPC32
++ select CRC32
++ help
++ Power Macintoshes and clones with Ethernet built-in on the
++ motherboard will usually use a MACE (Medium Access Control for
++ Ethernet) interface. Say Y to include support for the MACE chip.
++
++ To compile this driver as a module, choose M here: the module
++ will be called mace.
++
++config MACE_AAUI_PORT
++ bool "Use AAUI port instead of TP by default"
++ depends on MACE
++ help
++ Some Apple machines (notably the Apple Network Server) which use the
++ MACE ethernet chip have an Apple AUI port (small 15-pin connector),
++ instead of an 8-pin RJ45 connector for twisted-pair ethernet. Say
++ Y here if you have such a machine. If unsure, say N.
++ The driver will default to AAUI on ANS anyway, and if you use it as
++ a module, you can provide the port_aaui=0|1 to force the driver.
++
++config BMAC
++ tristate "BMAC (G3 ethernet) support"
++ depends on PPC_PMAC && PPC32
++ select CRC32
++ help
++ Say Y for support of BMAC Ethernet interfaces. These are used on G3
++ computers.
++
++ To compile this driver as a module, choose M here: the module
++ will be called bmac.
++
++config ARIADNE
++ tristate "Ariadne support"
++ depends on ZORRO
++ help
++ If you have a Village Tronic Ariadne Ethernet adapter, say Y.
++ Otherwise, say N.
++
++ To compile this driver as a module, choose M here: the module
++ will be called ariadne.
++
++config A2065
++ tristate "A2065 support"
++ depends on ZORRO
++ select CRC32
++ help
++ If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
++ say N.
++
++ To compile this driver as a module, choose M here: the module
++ will be called a2065.
++
++config HYDRA
++ tristate "Hydra support"
++ depends on ZORRO
++ select CRC32
++ help
++ If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.
++
++ To compile this driver as a module, choose M here: the module
++ will be called hydra.
++
++config ZORRO8390
++ tristate "Zorro NS8390-based Ethernet support"
++ depends on ZORRO
++ select CRC32
++ help
++ This driver is for Zorro Ethernet cards using an NS8390-compatible
++ chipset, like the Village Tronic Ariadne II and the Individual
++ Computers X-Surf Ethernet cards. If you have such a card, say Y.
++ Otherwise, say N.
++
++ To compile this driver as a module, choose M here: the module
++ will be called zorro8390.
++
++config APNE
++ tristate "PCMCIA NE2000 support"
++ depends on AMIGA_PCMCIA
++ select CRC32
++ help
++ If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise,
++ say N.
++
++ To compile this driver as a module, choose M here: the module
++ will be called apne.
++
++config MAC8390
++ bool "Macintosh NS 8390 based ethernet cards"
++ depends on MAC
++ select CRC32
++ help
++ If you want to include a driver to support Nubus or LC-PDS
++ Ethernet cards using an NS8390 chipset or its equivalent, say Y
++ and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++config MAC89x0
++ tristate "Macintosh CS89x0 based ethernet cards"
++ depends on MAC
++ ---help---
++ Support for CS89x0 chipset based Ethernet cards. If you have a
++ Nubus or LC-PDS network (Ethernet) card of this type, say Y and
++ read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. This module will
++ be called mac89x0.
++
++config MACSONIC
++ tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
++ depends on MAC
++ ---help---
++ Support for NatSemi SONIC based Ethernet devices. This includes
++ the onboard Ethernet in many Quadras as well as some LC-PDS,
++ a few Nubus and all known Comm Slot Ethernet cards. If you have
++ one of these say Y and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. This module will
++ be called macsonic.
++
++config MACMACE
++ bool "Macintosh (AV) onboard MACE ethernet"
++ depends on MAC
++ select CRC32
++ help
++ Support for the onboard AMD 79C940 MACE Ethernet controller used in
++ the 660AV and 840AV Macintosh. If you have one of these Macintoshes
++ say Y and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++config MVME147_NET
++ tristate "MVME147 (Lance) Ethernet support"
++ depends on MVME147
++ select CRC32
++ help
++ Support for the on-board Ethernet interface on the Motorola MVME147
++ single-board computer. Say Y here to include the
++ driver for this chip in your kernel.
++ To compile this driver as a module, choose M here.
++
++config MVME16x_NET
++ tristate "MVME16x Ethernet support"
++ depends on MVME16x
++ help
++ This is the driver for the Ethernet interface on the Motorola
++ MVME162, 166, 167, 172 and 177 boards. Say Y here to include the
++ driver for this chip in your kernel.
++ To compile this driver as a module, choose M here.
++
++config BVME6000_NET
++ tristate "BVME6000 Ethernet support"
++ depends on BVME6000
++ help
++ This is the driver for the Ethernet interface on BVME4000 and
++ BVME6000 VME boards. Say Y here to include the driver for this chip
++ in your kernel.
++ To compile this driver as a module, choose M here.
++
++config ATARILANCE
++ tristate "Atari Lance support"
++ depends on ATARI
++ help
++ Say Y to include support for several Atari Ethernet adapters based
++ on the AMD Lance chipset: RieblCard (with or without battery), or
++ PAMCard VME (also the version by Rhotron, with different addresses).
++
++config SUN3LANCE
++ tristate "Sun3/Sun3x on-board LANCE support"
++ depends on SUN3 || SUN3X
++ help
++ Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
++ featured an AMD Lance 10Mbit Ethernet controller on board; say Y
++ here to compile in the Linux driver for this and enable Ethernet.
++ General Linux information on the Sun 3 and 3x series (now
++ discontinued) is at
++ <http://www.angelfire.com/ca2/tech68k/sun3.html>.
++
++ If you're not building a kernel for a Sun 3, say N.
++
++config SUN3_82586
++ bool "Sun3 on-board Intel 82586 support"
++ depends on SUN3
++ help
++ This driver enables support for the on-board Intel 82586 based
++ Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards. Note
++ that this driver does not support 82586-based adapters on additional
++ VME boards.
++
++config HPLANCE
++ bool "HP on-board LANCE support"
++ depends on DIO
++ select CRC32
++ help
++ If you want to use the builtin "LANCE" Ethernet controller on an
++ HP300 machine, say Y here.
++
++config LASI_82596
++ tristate "Lasi ethernet"
++ depends on GSC
++ help
++ Say Y here to support the builtin Intel 82596 ethernet controller
++ found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
++
++config SNI_82596
++ tristate "SNI RM ethernet"
++ depends on NET_ETHERNET && SNI_RM
++ help
++ Say Y here to support the on-board Intel 82596 ethernet controller
++ built into SNI RM machines.
++
++config KORINA
++ tristate "Korina (IDT RC32434) Ethernet support"
++ depends on NET_ETHERNET && MIKROTIK_RB532
++ help
++ If you have a Mikrotik RouterBoard 500 or IDT RC32434
++ based system say Y. Otherwise say N.
++
++config MIPS_JAZZ_SONIC
++ tristate "MIPS JAZZ onboard SONIC Ethernet support"
++ depends on MACH_JAZZ
++ help
++ This is the driver for the onboard card of MIPS Magnum 4000,
++ Acer PICA, Olivetti M700-10 and a few other identical OEM systems.
++
++config XTENSA_XT2000_SONIC
++ tristate "Xtensa XT2000 onboard SONIC Ethernet support"
++ depends on XTENSA_PLATFORM_XT2000
++ help
++ This is the driver for the onboard card of the Xtensa XT2000 board.
++
++config MIPS_AU1X00_ENET
++ tristate "MIPS AU1000 Ethernet support"
++ depends on SOC_AU1X00
++ select PHYLIB
++ select CRC32
++ help
++ If you have an Alchemy Semi AU1X00 based system
++ say Y. Otherwise, say N.
++
++config SGI_IOC3_ETH
++ bool "SGI IOC3 Ethernet"
++ depends on PCI && SGI_IP27
++ select CRC32
++ select MII
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++config MIPS_SIM_NET
++ tristate "MIPS simulator Network device"
++ depends on MIPS_SIM
++ help
++ The MIPSNET device is a simple Ethernet network device which is
++ emulated by the MIPS Simulator.
++ If you are not using a MIPSsim or are unsure, say N.
++
++config SGI_O2MACE_ETH
++ tristate "SGI O2 MACE Fast Ethernet support"
++ depends on SGI_IP32=y
++
++config STNIC
++ tristate "National DP83902AV support"
++ depends on SUPERH
++ select CRC32
++ help
++ Support for cards based on the National Semiconductor DP83902AV
++ ST-NIC Serial Network Interface Controller for Twisted Pair. This
++ is a 10Mbit/sec Ethernet controller. Product overview and specs at
++ <http://www.national.com/pf/DP/DP83902A.html>.
++
++ If unsure, say N.
++
++config SH_ETH
++ tristate "Renesas SuperH Ethernet support"
++ depends on SUPERH && \
++ (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
++ CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
++ CPU_SUBTYPE_SH7724)
++ select CRC32
++ select MII
++ select MDIO_BITBANG
++ select PHYLIB
++ help
++ Renesas SuperH Ethernet device driver.
++ This driver support SH7710, SH7712, SH7763, SH7619, and SH7724.
++
++config SUNLANCE
++ tristate "Sun LANCE support"
++ depends on SBUS
++ select CRC32
++ help
++ This driver supports the "le" interface present on all 32-bit Sparc
++ systems, on some older Ultra systems and as an Sbus option. These
++ cards are based on the AMD Lance chipset, which is better known
++ via the NE2100 cards.
++
++ To compile this driver as a module, choose M here: the module
++ will be called sunlance.
++
++config HAPPYMEAL
++ tristate "Sun Happy Meal 10/100baseT support"
++ depends on SBUS || PCI
++ select CRC32
++ help
++ This driver supports the "hme" interface present on most Ultra
++ systems and as an option on older Sbus systems. This driver supports
++ both PCI and Sbus devices. This driver also supports the "qfe" quad
++ 100baseT device available in both PCI and Sbus configurations.
++
++ To compile this driver as a module, choose M here: the module
++ will be called sunhme.
++
++config SUNBMAC
++ tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
++ depends on SBUS && EXPERIMENTAL
++ select CRC32
++ help
++ This driver supports the "be" interface available as an Sbus option.
++ This is Sun's older 100baseT Ethernet device.
++
++ To compile this driver as a module, choose M here: the module
++ will be called sunbmac.
++
++config SUNQE
++ tristate "Sun QuadEthernet support"
++ depends on SBUS
++ select CRC32
++ help
++ This driver supports the "qe" 10baseT Ethernet device, available as
++ an Sbus option. Note that this is not the same as Quad FastEthernet
++ "qfe" which is supported by the Happy Meal driver instead.
++
++ To compile this driver as a module, choose M here: the module
++ will be called sunqe.
++
++config SUNGEM
++ tristate "Sun GEM support"
++ depends on PCI
++ select CRC32
++ help
++ Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
++ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
++
++config CASSINI
++ tristate "Sun Cassini support"
++ depends on PCI
++ select CRC32
++ help
++ Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
++ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
++
++config SUNVNET
++ tristate "Sun Virtual Network support"
++ depends on SUN_LDOMS
++ help
++ Support for virtual network devices under Sun Logical Domains.
++
++config NET_VENDOR_3COM
++ bool "3COM cards"
++ depends on ISA || EISA || MCA || PCI
++ help
++ If you have a network (Ethernet) card belonging to this class, say Y
++ and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ Note that the answer to this question doesn't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the questions about 3COM cards. If you say Y, you will be asked for
++ your specific card in the following questions.
++
++config EL1
++ tristate "3c501 \"EtherLink\" support"
++ depends on NET_VENDOR_3COM && ISA
++ ---help---
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>. Also, consider buying a
++ new card, since the 3c501 is slow, broken, and obsolete: you will
++ have problems. Some people suggest to ping ("man ping") a nearby
++ machine every minute ("man cron") when using this card.
++
++ To compile this driver as a module, choose M here. The module
++ will be called 3c501.
++
++config EL2
++ tristate "3c503 \"EtherLink II\" support"
++ depends on NET_VENDOR_3COM && ISA
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called 3c503.
++
++config ELPLUS
++ tristate "3c505 \"EtherLink Plus\" support"
++ depends on NET_VENDOR_3COM && ISA && ISA_DMA_API
++ ---help---
++ Information about this network (Ethernet) card can be found in
++ <file:Documentation/networking/3c505.txt>. If you have a card of
++ this type, say Y and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called 3c505.
++
++config EL16
++ tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
++ depends on NET_VENDOR_3COM && ISA && EXPERIMENTAL
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called 3c507.
++
++config EL3
++ tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
++ depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
++ ---help---
++ If you have a network (Ethernet) card belonging to the 3Com
++ EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
++ from <http://www.tldp.org/docs.html#howto>.
++
++ If your card is not working you may need to use the DOS
++ setup disk to disable Plug & Play mode, and to select the default
++ media type.
++
++ To compile this driver as a module, choose M here. The module
++ will be called 3c509.
++
++config 3C515
++ tristate "3c515 ISA \"Fast EtherLink\""
++ depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
++ help
++ If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
++ network card, say Y and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called 3c515.
++
++config ELMC
++ tristate "3c523 \"EtherLink/MC\" support"
++ depends on NET_VENDOR_3COM && MCA_LEGACY
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called 3c523.
++
++config ELMC_II
++ tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
++ depends on NET_VENDOR_3COM && MCA && MCA_LEGACY
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called 3c527.
++
++config VORTEX
++ tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
++ depends on NET_VENDOR_3COM && (PCI || EISA)
++ select MII
++ ---help---
++ This option enables driver support for a large number of 10Mbps and
++ 10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
++
++ "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
++ "Boomerang" (EtherLink XL 3c900 or 3c905) PCI
++ "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus
++ "Tornado" (3c905) PCI
++ "Hurricane" (3c555/3cSOHO) PCI
++
++ If you have such a card, say Y and read the Ethernet-HOWTO,
++ available from <http://www.tldp.org/docs.html#howto>. More
++ specific information is in
++ <file:Documentation/networking/vortex.txt> and in the comments at
++ the beginning of <file:drivers/net/3c59x.c>.
++
++ To compile this support as a module, choose M here.
++
++config TYPHOON
++ tristate "3cr990 series \"Typhoon\" support"
++ depends on NET_VENDOR_3COM && PCI
++ select CRC32
++ ---help---
++ This option enables driver support for the 3cr990 series of cards:
++
++ 3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,
++ 3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server,
++ 3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR
++
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called typhoon.
++
++config LANCE
++ tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
++ depends on ISA && ISA_DMA_API
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>. Some LinkSys cards are
++ of this type.
++
++ To compile this driver as a module, choose M here: the module
++ will be called lance. This is recommended.
++
++config NET_VENDOR_SMC
++ bool "Western Digital/SMC cards"
++ depends on ISA || MCA || EISA || MAC
++ help
++ If you have a network (Ethernet) card belonging to this class, say Y
++ and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ Note that the answer to this question doesn't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the questions about Western Digital cards. If you say Y, you will be
++ asked for your specific card in the following questions.
++
++config WD80x3
++ tristate "WD80*3 support"
++ depends on NET_VENDOR_SMC && ISA
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called wd.
++
++config ULTRAMCA
++ tristate "SMC Ultra MCA support"
++ depends on NET_VENDOR_SMC && MCA
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type and are running
++ an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
++ available from <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called smc-mca.
++
++config ULTRA
++ tristate "SMC Ultra support"
++ depends on NET_VENDOR_SMC && ISA
++ select CRC32
++ ---help---
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ Important: There have been many reports that, with some motherboards
++ mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
++ such as some BusLogic models) causes corruption problems with many
++ operating systems. The Linux smc-ultra driver has a work-around for
++ this but keep it in mind if you have such a SCSI card and have
++ problems.
++
++ To compile this driver as a module, choose M here. The module
++ will be called smc-ultra.
++
++config ULTRA32
++ tristate "SMC Ultra32 EISA support"
++ depends on NET_VENDOR_SMC && EISA
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called smc-ultra32.
++
++config BFIN_MAC
++ tristate "Blackfin on-chip MAC support"
++ depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
++ select CRC32
++ select MII
++ select PHYLIB
++ select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
++ help
++ This is the driver for Blackfin on-chip mac device. Say Y if you want it
++ compiled into the kernel. This driver is also available as a module
++ ( = code which can be inserted in and removed from the running kernel
++ whenever you want). The module will be called bfin_mac.
++
++config BFIN_MAC_USE_L1
++ bool "Use L1 memory for rx/tx packets"
++ depends on BFIN_MAC && (BF527 || BF537)
++ default y
++ help
++ To get maximum network performance, you should use L1 memory as rx/tx buffers.
++ Say N here if you want to reserve L1 memory for other uses.
++
++config BFIN_TX_DESC_NUM
++ int "Number of transmit buffer packets"
++ depends on BFIN_MAC
++ range 6 10 if BFIN_MAC_USE_L1
++ range 10 100
++ default "10"
++ help
++ Set the number of buffer packets used in driver.
++
++config BFIN_RX_DESC_NUM
++ int "Number of receive buffer packets"
++ depends on BFIN_MAC
++ range 20 100 if BFIN_MAC_USE_L1
++ range 20 800
++ default "20"
++ help
++ Set the number of buffer packets used in driver.
++
++config BFIN_MAC_RMII
++ bool "RMII PHY Interface"
++ depends on BFIN_MAC
++ default y if BFIN527_EZKIT
++ default n if BFIN537_STAMP
++ help
++ Use Reduced PHY MII Interface
++
++config BFIN_MAC_USE_HWSTAMP
++ bool "Use IEEE 1588 hwstamp"
++ depends on BFIN_MAC && BF518
++ default y
++ help
++ To support the IEEE 1588 Precision Time Protocol (PTP), select y here
++
++config SMC9194
++ tristate "SMC 9194 support"
++ depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
++ select CRC32
++ ---help---
++ This is support for the SMC9xxx based Ethernet cards. Choose this
++ option if you have a DELL laptop with the docking station, or
++ another SMC9192/9194 based chipset. Say Y if you want it compiled
++ into the kernel, and read the file
++ <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
++ available from <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called smc9194.
++
++config SMC91X
++ tristate "SMC 91C9x/91C1xxx support"
++ select CRC32
++ select MII
++ depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \
++ MIPS || BLACKFIN || MN10300 || COLDFIRE
++ help
++ This is a driver for SMC's 91x series of Ethernet chipsets,
++ including the SMC91C94 and the SMC91C111. Say Y if you want it
++ compiled into the kernel, and read the file
++ <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
++ available from <http://www.linuxdoc.org/docs.html#howto>.
++
++ This driver is also available as a module ( = code which can be
++ inserted in and removed from the running kernel whenever you want).
++ The module will be called smc91x. If you want to compile it as a
++ module, say M here and read <file:Documentation/kbuild/modules.txt>.
++
++config NET_NETX
++ tristate "NetX Ethernet support"
++ select MII
++ depends on ARCH_NETX
++ help
++ This is support for the Hilscher netX builtin Ethernet ports
++
++ To compile this driver as a module, choose M here. The module
++ will be called netx-eth.
++
++config TI_DAVINCI_EMAC
++ tristate "TI DaVinci EMAC Support"
++ depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
++ select PHYLIB
++ help
++ This driver supports TI's DaVinci Ethernet .
++
++ To compile this driver as a module, choose M here: the module
++ will be called davinci_emac_driver. This is recommended.
++
++config DM9000
++ tristate "DM9000 support"
++ depends on ARM || BLACKFIN || MIPS
++ select CRC32
++ select MII
++ ---help---
++ Support for DM9000 chipset.
++
++ To compile this driver as a module, choose M here. The module
++ will be called dm9000.
++
++config DM9000_DEBUGLEVEL
++ int "DM9000 maximum debug level"
++ depends on DM9000
++ default 4
++ help
++ The maximum level of debugging code compiled into the DM9000
++ driver.
++
++config DM9000_FORCE_SIMPLE_PHY_POLL
++ bool "Force simple NSR based PHY polling"
++ depends on DM9000
++ ---help---
++ This configuration forces the DM9000 to use the NSR's LinkStatus
++ bit to determine if the link is up or down instead of the more
++ costly MII PHY reads. Note, this will not work if the chip is
++ operating with an external PHY.
++
++config ENC28J60
++ tristate "ENC28J60 support"
++ depends on EXPERIMENTAL && SPI && NET_ETHERNET
++ select CRC32
++ ---help---
++ Support for the Microchip EN28J60 ethernet chip.
++
++ To compile this driver as a module, choose M here. The module will be
++ called enc28j60.
++
++config ENC28J60_WRITEVERIFY
++ bool "Enable write verify"
++ depends on ENC28J60
++ ---help---
++ Enable the verify after the buffer write useful for debugging purpose.
++ If unsure, say N.
++
++config ETHOC
++ tristate "OpenCores 10/100 Mbps Ethernet MAC support"
++ depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
++ select MII
++ select PHYLIB
++ select CRC32
++ select BITREVERSE
++ help
++ Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
++
++config GRETH
++ tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
++ depends on SPARC
++ select PHYLIB
++ select CRC32
++ help
++ Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
++
++config SMC911X
++ tristate "SMSC LAN911[5678] support"
++ select CRC32
++ select MII
++ depends on ARM || SUPERH
++ help
++ This is a driver for SMSC's LAN911x series of Ethernet chipsets
++ including the new LAN9115, LAN9116, LAN9117, and LAN9118.
++ Say Y if you want it compiled into the kernel,
++ and read the Ethernet-HOWTO, available from
++ <http://www.linuxdoc.org/docs.html#howto>.
++
++ This driver is also available as a module. The module will be
++ called smc911x. If you want to compile it as a module, say M
++ here and read <file:Documentation/kbuild/modules.txt>
++
++config SMSC911X
++ tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
++ depends on ARM || SUPERH || BLACKFIN || MIPS
++ select CRC32
++ select MII
++ select PHYLIB
++ ---help---
++ Say Y here if you want support for SMSC LAN911x and LAN921x families
++ of ethernet controllers.
++
++ To compile this driver as a module, choose M here and read
++ <file:Documentation/networking/net-modules.txt>. The module
++ will be called smsc911x.
++
++config NET_VENDOR_RACAL
++ bool "Racal-Interlan (Micom) NI cards"
++ depends on ISA
++ help
++ If you have a network (Ethernet) card belonging to this class, such
++ as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO,
++ available from <http://www.tldp.org/docs.html#howto>.
++
++ Note that the answer to this question doesn't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the questions about NI cards. If you say Y, you will be asked for
++ your specific card in the following questions.
++
++config NI5010
++ tristate "NI5010 support (EXPERIMENTAL)"
++ depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
++ ---help---
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>. Note that this is still
++ experimental code.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ni5010.
++
++config NI52
++ tristate "NI5210 support"
++ depends on NET_VENDOR_RACAL && ISA
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ni52.
++
++config NI65
++ tristate "NI6510 support"
++ depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ni65.
++
++config DNET
++ tristate "Dave ethernet support (DNET)"
++ depends on NET_ETHERNET && HAS_IOMEM
++ select PHYLIB
++ help
++ The Dave ethernet interface (DNET) is found on Qong Board FPGA.
++ Say Y to include support for the DNET chip.
++
++ To compile this driver as a module, choose M here: the module
++ will be called dnet.
++
++source "drivers/net/tulip/Kconfig"
++
++config AT1700
++ tristate "AT1700/1720 support (EXPERIMENTAL)"
++ depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
++ select CRC32
++ ---help---
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called at1700.
++
++config DEPCA
++ tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
++ depends on ISA || EISA || MCA
++ select CRC32
++ ---help---
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto> as well as
++ <file:drivers/net/depca.c>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called depca.
++
++config HP100
++ tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
++ depends on ISA || EISA || PCI
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called hp100.
++
++config NET_ISA
++ bool "Other ISA cards"
++ depends on ISA
++ ---help---
++ If your network (Ethernet) card hasn't been mentioned yet and its
++ bus system (that's the way the cards talks to the other components
++ of your computer) is ISA (as opposed to EISA, VLB or PCI), say Y.
++ Make sure you know the name of your card. Read the Ethernet-HOWTO,
++ available from <http://www.tldp.org/docs.html#howto>.
++
++ If unsure, say Y.
++
++ Note that the answer to this question doesn't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the remaining ISA network card questions. If you say Y, you will be
++ asked for your specific card in the following questions.
++
++config E2100
++ tristate "Cabletron E21xx support"
++ depends on NET_ISA
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called e2100.
++
++config EWRK3
++ tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
++ depends on NET_ISA
++ select CRC32
++ ---help---
++ This driver supports the DE203, DE204 and DE205 network (Ethernet)
++ cards. If this is for you, say Y and read
++ <file:Documentation/networking/ewrk3.txt> in the kernel source as
++ well as the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ewrk3.
++
++config EEXPRESS
++ tristate "EtherExpress 16 support"
++ depends on NET_ISA
++ ---help---
++ If you have an EtherExpress16 network (Ethernet) card, say Y and
++ read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>. Note that the Intel
++ EtherExpress16 card used to be regarded as a very poor choice
++ because the driver was very unreliable. We now have a new driver
++ that should do better.
++
++ To compile this driver as a module, choose M here. The module
++ will be called eexpress.
++
++config EEXPRESS_PRO
++ tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
++ depends on NET_ISA
++ ---help---
++ If you have a network (Ethernet) card of this type, say Y. This
++ driver supports Intel i82595{FX,TX} based boards. Note however
++ that the EtherExpress PRO/100 Ethernet card has its own separate
++ driver. Please read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called eepro.
++
++config HPLAN_PLUS
++ tristate "HP PCLAN+ (27247B and 27252A) support"
++ depends on NET_ISA
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called hp-plus.
++
++config HPLAN
++ tristate "HP PCLAN (27245 and other 27xxx series) support"
++ depends on NET_ISA
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called hp.
++
++config LP486E
++ tristate "LP486E on board Ethernet"
++ depends on NET_ISA
++ help
++ Say Y here to support the 82596-based on-board Ethernet controller
++ for the Panther motherboard, which is one of the two shipped in the
++ Intel Professional Workstation.
++
++config ETH16I
++ tristate "ICL EtherTeam 16i/32 support"
++ depends on NET_ISA
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called eth16i.
++
++config NE2000
++ tristate "NE2000/NE1000 support"
++ depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX
++ select CRC32
++ ---help---
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>. Many Ethernet cards
++ without a specific driver are compatible with NE2000.
++
++ If you have a PCI NE2000 card however, say N here and Y to "PCI
++ NE2000 and clone support" under "EISA, VLB, PCI and on board
++ controllers" below. If you have a NE2000 card and are running on
++ an MCA system (a bus system used on some IBM PS/2 computers and
++ laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
++ below.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ne.
++
++config ZNET
++ tristate "Zenith Z-Note support (EXPERIMENTAL)"
++ depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
++ help
++ The Zenith Z-Note notebook computer has a built-in network
++ (Ethernet) card, and this is the Linux driver for it. Note that the
++ IBM Thinkpad 300 is compatible with the Z-Note and is also supported
++ by this driver. Read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++config SEEQ8005
++ tristate "SEEQ8005 support (EXPERIMENTAL)"
++ depends on NET_ISA && EXPERIMENTAL
++ help
++ This is a driver for the SEEQ 8005 network (Ethernet) card. If this
++ is for you, read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called seeq8005.
++
++config NE2_MCA
++ tristate "NE/2 (ne2000 MCA version) support"
++ depends on MCA_LEGACY
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ne2.
++
++config IBMLANA
++ tristate "IBM LAN Adapter/A support"
++ depends on MCA
++ ---help---
++ This is a Micro Channel Ethernet adapter. You need to set
++ CONFIG_MCA to use this driver. It is both available as an in-kernel
++ driver and as a module.
++
++ To compile this driver as a module, choose M here. The only
++ currently supported card is the IBM LAN Adapter/A for Ethernet. It
++ will both support 16K and 32K memory windows, however a 32K window
++ gives a better security against packet losses. Usage of multiple
++ boards with this driver should be possible, but has not been tested
++ up to now due to lack of hardware.
++
++config IBMVETH
++ tristate "IBM LAN Virtual Ethernet support"
++ depends on PPC_PSERIES
++ ---help---
++ This driver supports virtual ethernet adapters on newer IBM iSeries
++ and pSeries systems.
++
++ To compile this driver as a module, choose M here. The module will
++ be called ibmveth.
++
++source "drivers/net/ibm_newemac/Kconfig"
++
++config NET_PCI
++ bool "EISA, VLB, PCI and on board controllers"
++ depends on ISA || EISA || PCI
++ help
++ This is another class of network cards which attach directly to the
++ bus. If you have one of those, say Y and read the Ethernet-HOWTO,
++ available from <http://www.tldp.org/docs.html#howto>.
++
++ Note that the answer to this question doesn't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the questions about this class of network cards. If you say Y, you
++ will be asked for your specific card in the following questions. If
++ you are unsure, say Y.
++
++config PCNET32
++ tristate "AMD PCnet32 PCI support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ help
++ If you have a PCnet32 or PCnetPCI based network (Ethernet) card,
++ answer Y here and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called pcnet32.
++
++config AMD8111_ETH
++ tristate "AMD 8111 (new PCI lance) support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ help
++ If you have an AMD 8111-based PCI lance ethernet card,
++ answer Y here and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called amd8111e.
++
++config ADAPTEC_STARFIRE
++ tristate "Adaptec Starfire/DuraLAN support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ help
++ Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network
++ adapter. The DuraLAN chip is used on the 64 bit PCI boards from
++ Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip
++ driver.
++
++ To compile this driver as a module, choose M here: the module
++ will be called starfire. This is recommended.
++
++config AC3200
++ tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
++ depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ac3200.
++
++config KSZ884X_PCI
++ tristate "Micrel KSZ8841/2 PCI"
++ depends on NET_PCI && PCI
++ select MII
++ select CRC32
++ help
++ This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ksz884x.
++
++config APRICOT
++ tristate "Apricot Xen-II on board Ethernet"
++ depends on NET_PCI && ISA
++ help
++ If you have a network (Ethernet) controller of this type, say Y and
++ read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called apricot.
++
++config B44
++ tristate "Broadcom 440x/47xx ethernet support"
++ depends on SSB_POSSIBLE && HAS_DMA
++ select SSB
++ select MII
++ help
++ If you have a network (Ethernet) controller of this type, say Y
++ or M and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called b44.
++
++# Auto-select SSB PCI-HOST support, if possible
++config B44_PCI_AUTOSELECT
++ bool
++ depends on B44 && SSB_PCIHOST_POSSIBLE
++ select SSB_PCIHOST
++ default y
++
++# Auto-select SSB PCICORE driver, if possible
++config B44_PCICORE_AUTOSELECT
++ bool
++ depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE
++ select SSB_DRIVER_PCICORE
++ default y
++
++config B44_PCI
++ bool
++ depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT
++ default y
++
++config FORCEDETH
++ tristate "nForce Ethernet support"
++ depends on NET_PCI && PCI
++ help
++ If you have a network (Ethernet) controller of this type, say Y and
++ read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called forcedeth.
++
++config CS89x0
++ tristate "CS89x0 support"
++ depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
++ || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)
++ ---help---
++ Support for CS89x0 chipset based Ethernet cards. If you have a
++ network (Ethernet) card of this type, say Y and read the
++ Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto> as well as
++ <file:Documentation/networking/cs89x0.txt>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called cs89x0.
++
++config CS89x0_NONISA_IRQ
++ def_bool y
++ depends on CS89x0 != n
++ depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS
++
++config TC35815
++ tristate "TOSHIBA TC35815 Ethernet support"
++ depends on NET_PCI && PCI && MIPS
++ select PHYLIB
++
++config E100
++ tristate "Intel(R) PRO/100+ support"
++ depends on NET_PCI && PCI
++ select MII
++ ---help---
++ This driver supports Intel(R) PRO/100 family of adapters.
++ To verify that your adapter is supported, find the board ID number
++ on the adapter. Look for a label that has a barcode and a number
++ in the format 123456-001 (six digits hyphen three digits).
++
++ Use the above information and the Adapter & Driver ID Guide at:
++
++ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
++
++ to identify the adapter.
++
++ For the latest Intel PRO/100 network driver for Linux, see:
++
++ <http://appsr.intel.com/scripts-df/support_intel.asp>
++
++ More specific information on configuring the driver is in
++ <file:Documentation/networking/e100.txt>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called e100.
++
++config LNE390
++ tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
++ depends on NET_PCI && EISA && EXPERIMENTAL
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called lne390.
++
++config FEALNX
++ tristate "Myson MTD-8xx PCI Ethernet support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ help
++ Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet
++ cards. Specifications and data at
++ <http://www.myson.com.hk/mtd/datasheet/>.
++
++config NATSEMI
++ tristate "National Semiconductor DP8381x series PCI Ethernet support"
++ depends on NET_PCI && PCI
++ select CRC32
++ help
++ This driver is for the National Semiconductor DP83810 series,
++ which is used in cards from PureData, NetGear, Linksys
++ and others, including the 83815 chip.
++ More specific information and updates are available from
++ <http://www.scyld.com/network/natsemi.html>.
++
++config NE2K_PCI
++ tristate "PCI NE2000 and clones support (see help)"
++ depends on NET_PCI && PCI
++ select CRC32
++ ---help---
++ This driver is for NE2000 compatible PCI cards. It will not work
++ with ISA NE2000 cards (they have their own driver, "NE2000/NE1000
++ support" below). If you have a PCI NE2000 network (Ethernet) card,
++ say Y and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ This driver also works for the following NE2000 clone cards:
++ RealTek RTL-8029 Winbond 89C940 Compex RL2000 KTI ET32P2
++ NetVin NV5000SC Via 86C926 SureCom NE34 Winbond
++ Holtek HT80232 Holtek HT80229
++
++ To compile this driver as a module, choose M here. The module
++ will be called ne2k-pci.
++
++config NE3210
++ tristate "Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)"
++ depends on NET_PCI && EISA && EXPERIMENTAL
++ select CRC32
++ ---help---
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>. Note that this driver
++ will NOT WORK for NE3200 cards as they are completely different.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ne3210.
++
++config ES3210
++ tristate "Racal-Interlan EISA ES3210 support (EXPERIMENTAL)"
++ depends on NET_PCI && EISA && EXPERIMENTAL
++ select CRC32
++ help
++ If you have a network (Ethernet) card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called es3210.
++
++config 8139CP
++ tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"
++ depends on NET_PCI && PCI && EXPERIMENTAL
++ select CRC32
++ select MII
++ help
++ This is a driver for the Fast Ethernet PCI network cards based on
++ the RTL8139C+ chips. If you have one of those, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here: the module
++ will be called 8139cp. This is recommended.
++
++config 8139TOO
++ tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ ---help---
++ This is a driver for the Fast Ethernet PCI network cards based on
++ the RTL 8129/8130/8139 chips. If you have one of those, say Y and
++ read the Ethernet-HOWTO <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here: the module
++ will be called 8139too. This is recommended.
++
++config 8139TOO_PIO
++ bool "Use PIO instead of MMIO"
++ default y
++ depends on 8139TOO
++ help
++ This instructs the driver to use programmed I/O ports (PIO) instead
++ of PCI shared memory (MMIO). This can possibly solve some problems
++ in case your mainboard has memory consistency issues. If unsure,
++ say N.
++
++config 8139TOO_TUNE_TWISTER
++ bool "Support for uncommon RTL-8139 rev. K (automatic channel equalization)"
++ depends on 8139TOO
++ help
++ This implements a function which might come in handy in case you
++ are using low quality on long cabling. It is required for RealTek
++ RTL-8139 revision K boards, and totally unused otherwise. It tries
++ to match the transceiver to the cable characteristics. This is
++ experimental since hardly documented by the manufacturer.
++ If unsure, say Y.
++
++config 8139TOO_8129
++ bool "Support for older RTL-8129/8130 boards"
++ depends on 8139TOO
++ help
++ This enables support for the older and uncommon RTL-8129 and
++ RTL-8130 chips, which support MII via an external transceiver,
++ instead of an internal one. Disabling this option will save some
++ memory by making the code size smaller. If unsure, say Y.
++
++config 8139_OLD_RX_RESET
++ bool "Use older RX-reset method"
++ depends on 8139TOO
++ help
++ The 8139too driver was recently updated to contain a more rapid
++ reset sequence, in the face of severe receive errors. This "new"
++ RX-reset method should be adequate for all boards. But if you
++ experience problems, you can enable this option to restore the
++ old RX-reset behavior. If unsure, say N.
++
++config R6040
++ tristate "RDC R6040 Fast Ethernet Adapter support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ help
++ This is a driver for the R6040 Fast Ethernet MACs found in the
++ the RDC R-321x System-on-chips.
++
++ To compile this driver as a module, choose M here: the module
++ will be called r6040. This is recommended.
++
++config SIS900
++ tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ ---help---
++ This is a driver for the Fast Ethernet PCI network cards based on
++ the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
++ SiS 630 and SiS 540 chipsets.
++
++ This driver also supports AMD 79C901 HomePNA so that you can use
++ your phone line as a network cable.
++
++ To compile this driver as a module, choose M here: the module
++ will be called sis900. This is recommended.
++
++config EPIC100
++ tristate "SMC EtherPower II"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ help
++ This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
++ which is based on the SMC83c17x (EPIC/100).
++ More specific information and updates are available from
++ <http://www.scyld.com/network/epic100.html>.
++
++config SMSC9420
++ tristate "SMSC LAN9420 PCI ethernet adapter support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select PHYLIB
++ select SMSC_PHY
++ help
++ This is a driver for SMSC's LAN9420 PCI ethernet adapter.
++ Say Y if you want it compiled into the kernel,
++ and read the Ethernet-HOWTO, available from
++ <http://www.linuxdoc.org/docs.html#howto>.
++
++ This driver is also available as a module. The module will be
++ called smsc9420. If you want to compile it as a module, say M
++ here and read <file:Documentation/kbuild/modules.txt>
++
++config SUNDANCE
++ tristate "Sundance Alta support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ help
++ This driver is for the Sundance "Alta" chip.
++ More specific information and updates are available from
++ <http://www.scyld.com/network/sundance.html>.
++
++config SUNDANCE_MMIO
++ bool "Use MMIO instead of PIO"
++ depends on SUNDANCE
++ help
++ Enable memory-mapped I/O for interaction with Sundance NIC registers.
++ Do NOT enable this by default, PIO (enabled when MMIO is disabled)
++ is known to solve bugs on certain chips.
++
++ If unsure, say N.
++
++config TLAN
++ tristate "TI ThunderLAN support"
++ depends on NET_PCI && (PCI || EISA)
++ ---help---
++ If you have a PCI Ethernet network card based on the ThunderLAN chip
++ which is supported by this driver, say Y and read the
++ Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ Devices currently supported by this driver are Compaq Netelligent,
++ Compaq NetFlex and Olicom cards. Please read the file
++ <file:Documentation/networking/tlan.txt> for more details.
++
++ To compile this driver as a module, choose M here. The module
++ will be called tlan.
++
++ Please email feedback to <torben.mathiasen@compaq.com>.
++
++config KS8842
++ tristate "Micrel KSZ8842"
++ depends on HAS_IOMEM
++ help
++ This platform driver is for Micrel KSZ8842 / KS8842
++ 2-port ethernet switch chip (managed, VLAN, QoS).
++
++config KS8851
++ tristate "Micrel KS8851 SPI"
++ depends on SPI
++ select MII
++ select CRC32
++ help
++ SPI driver for Micrel KS8851 SPI attached network chip.
++
++config KS8851_MLL
++ tristate "Micrel KS8851 MLL"
++ depends on HAS_IOMEM
++ select MII
++ help
++ This platform driver is for Micrel KS8851 Address/data bus
++ multiplexed network chip.
++
++config VIA_RHINE
++ tristate "VIA Rhine support"
++ depends on NET_PCI && PCI
++ select CRC32
++ select MII
++ help
++ If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A),
++ Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type
++ Ethernet functions can also be found integrated on South Bridges
++ (e.g. VT8235).
++
++ To compile this driver as a module, choose M here. The module
++ will be called via-rhine.
++
++config VIA_RHINE_MMIO
++ bool "Use MMIO instead of PIO"
++ depends on VIA_RHINE
++ help
++ This instructs the driver to use PCI shared memory (MMIO) instead of
++ programmed I/O ports (PIO). Enabling this gives an improvement in
++ processing time in parts of the driver.
++
++ If unsure, say Y.
++
++config SC92031
++ tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
++ depends on NET_PCI && PCI && EXPERIMENTAL
++ select CRC32
++ ---help---
++ This is a driver for the Fast Ethernet PCI network cards based on
++ the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
++ have one of these, say Y here.
++
++ To compile this driver as a module, choose M here: the module
++ will be called sc92031. This is recommended.
++
++config CPMAC
++ tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
++ depends on NET_ETHERNET && EXPERIMENTAL && AR7
++ select PHYLIB
++ help
++ TI AR7 CPMAC Ethernet support
++
++config NET_POCKET
++ bool "Pocket and portable adapters"
++ depends on PARPORT
++ ---help---
++ Cute little network (Ethernet) devices which attach to the parallel
++ port ("pocket adapters"), commonly used with laptops. If you have
++ one of those, say Y and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ If you want to plug a network (or some other) card into the PCMCIA
++ (or PC-card) slot of your laptop instead (PCMCIA is the standard for
++ credit card size extension cards used by all modern laptops), you
++ need the pcmcia-cs package (location contained in the file
++ <file:Documentation/Changes>) and you can say N here.
++
++ Laptop users should read the Linux Laptop home page at
++ <http://www.linux-on-laptops.com/> or
++ Tuxmobil - Linux on Mobile Computers at <http://www.tuxmobil.org/>.
++
++ Note that the answer to this question doesn't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the questions about this class of network devices. If you say Y, you
++ will be asked for your specific device in the following questions.
++
++config ATP
++ tristate "AT-LAN-TEC/RealTek pocket adapter support"
++ depends on NET_POCKET && PARPORT && X86
++ select CRC32
++ ---help---
++ This is a network (Ethernet) device which attaches to your parallel
++ port. Read <file:drivers/net/atp.c> as well as the Ethernet-HOWTO,
++ available from <http://www.tldp.org/docs.html#howto>, if you
++ want to use this. If you intend to use this driver, you should have
++ said N to the "Parallel printer support", because the two drivers
++ don't like each other.
++
++ To compile this driver as a module, choose M here: the module
++ will be called atp.
++
++config DE600
++ tristate "D-Link DE600 pocket adapter support"
++ depends on NET_POCKET && PARPORT
++ ---help---
++ This is a network (Ethernet) device which attaches to your parallel
++ port. Read <file:Documentation/networking/DLINK.txt> as well as the
++ Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>, if you want to use
++ this. It is possible to have several devices share a single parallel
++ port and it is safe to compile the corresponding drivers into the
++ kernel.
++
++ To compile this driver as a module, choose M here: the module
++ will be called de600.
++
++config DE620
++ tristate "D-Link DE620 pocket adapter support"
++ depends on NET_POCKET && PARPORT
++ ---help---
++ This is a network (Ethernet) device which attaches to your parallel
++ port. Read <file:Documentation/networking/DLINK.txt> as well as the
++ Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>, if you want to use
++ this. It is possible to have several devices share a single parallel
++ port and it is safe to compile the corresponding drivers into the
++ kernel.
++
++ To compile this driver as a module, choose M here: the module
++ will be called de620.
++
++config SGISEEQ
++ tristate "SGI Seeq ethernet controller support"
++ depends on SGI_HAS_SEEQ
++ help
++ Say Y here if you have an Seeq based Ethernet network card. This is
++ used in many Silicon Graphics machines.
++
++config DECLANCE
++ tristate "DEC LANCE ethernet controller support"
++ depends on MACH_DECSTATION
++ select CRC32
++ help
++ This driver is for the series of Ethernet controllers produced by
++ DEC (now Compaq) based on the AMD Lance chipset, including the
++ DEPCA series. (This chipset is better known via the NE2100 cards.)
++
++config 68360_ENET
++ bool "Motorola 68360 ethernet controller"
++ depends on M68360
++ help
++ Say Y here if you want to use the built-in ethernet controller of
++ the Motorola 68360 processor.
++
++config FEC
++ bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
++ depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
++ MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5
++ select PHYLIB
++ help
++ Say Y here if you want to use the built-in 10/100 Fast ethernet
++ controller on some Motorola ColdFire and Freescale i.MX processors.
++
++config FEC2
++ bool "Second FEC ethernet controller (on some ColdFire CPUs)"
++ depends on FEC
++ help
++ Say Y here if you want to use the second built-in 10/100 Fast
++ ethernet controller on some Motorola ColdFire processors.
++
++config FEC_MPC52xx
++ tristate "MPC52xx FEC driver"
++ depends on PPC_MPC52xx && PPC_BESTCOMM
++ select CRC32
++ select PHYLIB
++ select PPC_BESTCOMM_FEC
++ ---help---
++ This option enables support for the MPC5200's on-chip
++ Fast Ethernet Controller
++ If compiled as module, it will be called fec_mpc52xx.
++
++config FEC_MPC52xx_MDIO
++ bool "MPC52xx FEC MDIO bus driver"
++ depends on FEC_MPC52xx
++ default y
++ ---help---
++ The MPC5200's FEC can connect to the Ethernet either with
++ an external MII PHY chip or 10 Mbps 7-wire interface
++ (Motorola? industry standard).
++ If your board uses an external PHY connected to FEC, enable this.
++ If not sure, enable.
++ If compiled as module, it will be called fec_mpc52xx_phy.
++
++config NE_H8300
++ tristate "NE2000 compatible support for H8/300"
++ depends on H8300
++ help
++ Say Y here if you want to use the NE2000 compatible
++ controller on the Renesas H8/300 processor.
++
++config ATL2
++ tristate "Atheros L2 Fast Ethernet support"
++ depends on PCI
++ select CRC32
++ select MII
++ help
++ This driver supports the Atheros L2 fast ethernet adapter.
++
++ To compile this driver as a module, choose M here. The module
++ will be called atl2.
++
++config XILINX_EMACLITE
++ tristate "Xilinx 10/100 Ethernet Lite support"
++ depends on PPC32 || MICROBLAZE
++ select PHYLIB
++ help
++ This driver supports the 10/100 Ethernet Lite from Xilinx.
++
++config BCM63XX_ENET
++ tristate "Broadcom 63xx internal mac support"
++ depends on BCM63XX
++ select MII
++ select PHYLIB
++ help
++ This driver supports the ethernet MACs in the Broadcom 63xx
++ MIPS chipset family (BCM63XX).
++
++source "drivers/net/fs_enet/Kconfig"
++
++source "drivers/net/octeon/Kconfig"
++
++endif # NET_ETHERNET
++
++#
++# Gigabit Ethernet
++#
++
++menuconfig NETDEV_1000
++ bool "Ethernet (1000 Mbit)"
++ depends on !UML
++ default y
++ ---help---
++ Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
++ type of Local Area Network (LAN) in universities and companies.
++
++ Say Y here to get to see options for Gigabit Ethernet drivers.
++ This option alone does not add any kernel code.
++ Note that drivers supporting both 100 and 1000 MBit may be listed
++ under "Ethernet (10 or 100MBit)" instead.
++
++ If you say N, all options in this submenu will be skipped and disabled.
++
++if NETDEV_1000
++
++config ACENIC
++ tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
++ depends on PCI
++ ---help---
++ Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
++ GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
++ adapter. The driver allows for using the Jumbo Frame option (9000
++ bytes/frame) however it requires that your switches can handle this
++ as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig
++ line.
++
++ To compile this driver as a module, choose M here: the
++ module will be called acenic.
++
++config ACENIC_OMIT_TIGON_I
++ bool "Omit support for old Tigon I based AceNICs"
++ depends on ACENIC
++ help
++ Say Y here if you only have Tigon II based AceNICs and want to leave
++ out support for the older Tigon I based cards which are no longer
++ being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B
++ version)). This will reduce the size of the driver object by
++ app. 100KB. If you are not sure whether your card is a Tigon I or a
++ Tigon II, say N here.
++
++ The safe and default value for this is N.
++
++config DL2K
++ tristate "DL2000/TC902x-based Gigabit Ethernet support"
++ depends on PCI
++ select CRC32
++ help
++ This driver supports DL2000/TC902x-based Gigabit ethernet cards,
++ which includes
++ D-Link DGE-550T Gigabit Ethernet Adapter.
++ D-Link DL2000-based Gigabit Ethernet Adapter.
++ Sundance/Tamarack TC902x Gigabit Ethernet Adapter.
++
++ To compile this driver as a module, choose M here: the
++ module will be called dl2k.
++
++config E1000
++ tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
++ depends on PCI
++ ---help---
++ This driver supports Intel(R) PRO/1000 gigabit ethernet family of
++ adapters. For more information on how to identify your adapter, go
++ to the Adapter & Driver ID Guide at:
++
++ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
++
++ For general information and support, go to the Intel support
++ website at:
++
++ <http://support.intel.com>
++
++ More specific information on configuring the driver is in
++ <file:Documentation/networking/e1000.txt>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called e1000.
++
++config E1000E
++ tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
++ depends on PCI && (!SPARC32 || BROKEN)
++ ---help---
++ This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
++ ethernet family of adapters. For PCI or PCI-X e1000 adapters,
++ use the regular e1000 driver For more information on how to
++ identify your adapter, go to the Adapter & Driver ID Guide at:
++
++ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
++
++ For general information and support, go to the Intel support
++ website at:
++
++ <http://support.intel.com>
++
++ To compile this driver as a module, choose M here. The module
++ will be called e1000e.
++
++config IP1000
++ tristate "IP1000 Gigabit Ethernet support"
++ depends on PCI && EXPERIMENTAL
++ select MII
++ ---help---
++ This driver supports IP1000 gigabit Ethernet cards.
++
++ To compile this driver as a module, choose M here: the module
++ will be called ipg. This is recommended.
++
++config IGB
++ tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
++ depends on PCI
++ ---help---
++ This driver supports Intel(R) 82575/82576 gigabit ethernet family of
++ adapters. For more information on how to identify your adapter, go
++ to the Adapter & Driver ID Guide at:
++
++ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
++
++ For general information and support, go to the Intel support
++ website at:
++
++ <http://support.intel.com>
++
++ More specific information on configuring the driver is in
++ <file:Documentation/networking/e1000.txt>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called igb.
++
++config IGB_DCA
++ bool "Direct Cache Access (DCA) Support"
++ default y
++ depends on IGB && DCA && !(IGB=y && DCA=m)
++ ---help---
++ Say Y here if you want to use Direct Cache Access (DCA) in the
++ driver. DCA is a method for warming the CPU cache before data
++ is used, with the intent of lessening the impact of cache misses.
++
++config IGBVF
++ tristate "Intel(R) 82576 Virtual Function Ethernet support"
++ depends on PCI
++ ---help---
++ This driver supports Intel(R) 82576 virtual functions. For more
++ information on how to identify your adapter, go to the Adapter &
++ Driver ID Guide at:
++
++ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
++
++ For general information and support, go to the Intel support
++ website at:
++
++ <http://support.intel.com>
++
++ More specific information on configuring the driver is in
++ <file:Documentation/networking/e1000.txt>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called igbvf.
++
++source "drivers/net/ixp2000/Kconfig"
++
++config MYRI_SBUS
++ tristate "MyriCOM Gigabit Ethernet support"
++ depends on SBUS
++ help
++ This driver supports MyriCOM Sbus gigabit Ethernet cards.
++
++ To compile this driver as a module, choose M here: the module
++ will be called myri_sbus. This is recommended.
++
++config NS83820
++ tristate "National Semiconductor DP83820 support"
++ depends on PCI
++ help
++ This is a driver for the National Semiconductor DP83820 series
++ of gigabit ethernet MACs. Cards using this chipset include
++ the D-Link DGE-500T, PureData's PDP8023Z-TG, SMC's SMC9462TX,
++ SOHO-GA2000T, SOHO-GA2500T. The driver supports the use of
++ zero copy.
++
++config HAMACHI
++ tristate "Packet Engines Hamachi GNIC-II support"
++ depends on PCI
++ select MII
++ help
++ If you have a Gigabit Ethernet card of this type, say Y and read
++ the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ To compile this driver as a module, choose M here. The module will be
++ called hamachi.
++
++config YELLOWFIN
++ tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
++ depends on PCI && EXPERIMENTAL
++ select CRC32
++ ---help---
++ Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
++ adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is
++ used by the Beowulf Linux cluster project. See
++ <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more
++ information about this driver in particular and Beowulf in general.
++
++ To compile this driver as a module, choose M here: the module
++ will be called yellowfin. This is recommended.
++
++config R8169
++ tristate "Realtek 8169 gigabit ethernet support"
++ depends on PCI
++ select CRC32
++ select MII
++ ---help---
++ Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
++
++ To compile this driver as a module, choose M here: the module
++ will be called r8169. This is recommended.
++
++config R8169_VLAN
++ bool "VLAN support"
++ depends on R8169 && VLAN_8021Q
++ ---help---
++ Say Y here for the r8169 driver to support the functions required
++ by the kernel 802.1Q code.
++
++ If in doubt, say Y.
++
++config SB1250_MAC
++ tristate "SB1250 Gigabit Ethernet support"
++ depends on SIBYTE_SB1xxx_SOC
++ select PHYLIB
++ ---help---
++ This driver supports Gigabit Ethernet interfaces based on the
++ Broadcom SiByte family of System-On-a-Chip parts. They include
++ the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455
++ and BCM1480 chips.
++
++ To compile this driver as a module, choose M here: the module
++ will be called sb1250-mac.
++
++config SIS190
++ tristate "SiS190/SiS191 gigabit ethernet support"
++ depends on PCI
++ select CRC32
++ select MII
++ ---help---
++ Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
++ a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
++ appear in lan on motherboard designs which are based on SiS 965
++ and SiS 966 south bridge.
++
++ To compile this driver as a module, choose M here: the module
++ will be called sis190. This is recommended.
++
++config SKGE
++ tristate "New SysKonnect GigaEthernet support"
++ depends on PCI
++ select CRC32
++ ---help---
++ This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
++ and related Gigabit Ethernet adapters. It is a new smaller driver
++ with better performance and more complete ethtool support.
++
++ It does not support the link failover and network management
++ features that "portable" vendor supplied sk98lin driver does.
++
++ This driver supports adapters based on the original Yukon chipset:
++ Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
++ Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.
++
++ It does not support the newer Yukon2 chipset: a separate driver,
++ sky2, is provided for Yukon2-based adapters.
++
++ To compile this driver as a module, choose M here: the module
++ will be called skge. This is recommended.
++
++config SKGE_DEBUG
++ bool "Debugging interface"
++ depends on SKGE && DEBUG_FS
++ help
++ This option adds the ability to dump driver state for debugging.
++ The file /sys/kernel/debug/skge/ethX displays the state of the internal
++ transmit and receive rings.
++
++ If unsure, say N.
++
++config SKY2
++ tristate "SysKonnect Yukon2 support"
++ depends on PCI
++ select CRC32
++ ---help---
++ This driver supports Gigabit Ethernet adapters based on the
++ Marvell Yukon 2 chipset:
++ Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
++ 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
++
++ There is companion driver for the older Marvell Yukon and
++ Genesis based adapters: skge.
++
++ To compile this driver as a module, choose M here: the module
++ will be called sky2. This is recommended.
++
++config SKY2_DEBUG
++ bool "Debugging interface"
++ depends on SKY2 && DEBUG_FS
++ help
++ This option adds the ability to dump driver state for debugging.
++ The file /sys/kernel/debug/sky2/ethX displays the state of the internal
++ transmit and receive rings.
++
++ If unsure, say N.
++
++config VIA_VELOCITY
++ tristate "VIA Velocity support"
++ depends on PCI
++ select CRC32
++ select CRC_CCITT
++ select MII
++ help
++ If you have a VIA "Velocity" based network card say Y here.
++
++ To compile this driver as a module, choose M here. The module
++ will be called via-velocity.
++
++config TIGON3
++ tristate "Broadcom Tigon3 support"
++ depends on PCI
++ select PHYLIB
++ help
++ This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
++
++ To compile this driver as a module, choose M here: the module
++ will be called tg3. This is recommended.
++
++config BNX2
++ tristate "Broadcom NetXtremeII support"
++ depends on PCI
++ select CRC32
++ select FW_LOADER
++ help
++ This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
++
++ To compile this driver as a module, choose M here: the module
++ will be called bnx2. This is recommended.
++
++config CNIC
++ tristate "Broadcom CNIC support"
++ depends on PCI
++ select BNX2
++ select UIO
++ help
++ This driver supports offload features of Broadcom NetXtremeII
++ gigabit Ethernet cards.
++
++ To compile this driver as a module, choose M here: the module
++ will be called cnic. This is recommended.
++
++config SPIDER_NET
++ tristate "Spider Gigabit Ethernet driver"
++ depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
++ select FW_LOADER
++ help
++ This driver supports the Gigabit Ethernet chips present on the
++ Cell Processor-Based Blades from IBM.
++
++config TSI108_ETH
++ tristate "Tundra TSI108 gigabit Ethernet support"
++ depends on TSI108_BRIDGE
++ help
++ This driver supports Tundra TSI108 gigabit Ethernet ports.
++ To compile this driver as a module, choose M here: the module
++ will be called tsi108_eth.
++
++config GELIC_NET
++ tristate "PS3 Gigabit Ethernet driver"
++ depends on PPC_PS3
++ select PS3_SYS_MANAGER
++ help
++ This driver supports the network device on the PS3 game
++ console. This driver has built-in support for Ethernet.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ps3_gelic.
++
++config GELIC_WIRELESS
++ bool "PS3 Wireless support"
++ depends on WLAN
++ depends on GELIC_NET
++ select WIRELESS_EXT
++ help
++ This option adds the support for the wireless feature of PS3.
++ If you have the wireless-less model of PS3 or have no plan to
++ use wireless feature, disabling this option saves memory. As
++ the driver automatically distinguishes the models, you can
++ safely enable this option even if you have a wireless-less model.
++
++config FSL_PQ_MDIO
++ tristate "Freescale PQ MDIO"
++ depends on FSL_SOC
++ select PHYLIB
++ help
++ This driver supports the MDIO bus used by the gianfar and UCC drivers.
++
++config GIANFAR
++ tristate "Gianfar Ethernet"
++ depends on FSL_SOC
++ select FSL_PQ_MDIO
++ select PHYLIB
++ select CRC32
++ help
++ This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
++ and MPC86xx family of chips, and the FEC on the 8540.
++
++config UCC_GETH
++ tristate "Freescale QE Gigabit Ethernet"
++ depends on QUICC_ENGINE
++ select FSL_PQ_MDIO
++ select PHYLIB
++ help
++ This driver supports the Gigabit Ethernet mode of the QUICC Engine,
++ which is available on some Freescale SOCs.
++
++config UGETH_TX_ON_DEMAND
++ bool "Transmit on Demand support"
++ depends on UCC_GETH
++
++config MV643XX_ETH
++ tristate "Marvell Discovery (643XX) and Orion ethernet support"
++ depends on MV64X60 || PPC32 || PLAT_ORION
++ select INET_LRO
++ select PHYLIB
++ help
++ This driver supports the gigabit ethernet MACs in the
++ Marvell Discovery PPC/MIPS chipset family (MV643XX) and
++ in the Marvell Orion ARM SoC family.
++
++ Some boards that use the Discovery chipset are the Momenco
++ Ocelot C and Jaguar ATX and Pegasos II.
++
++config XILINX_LL_TEMAC
++ tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
++ depends on PPC || MICROBLAZE
++ select PHYLIB
++ help
++ This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
++ core used in Xilinx Spartan and Virtex FPGAs
++
++config QLA3XXX
++ tristate "QLogic QLA3XXX Network Driver Support"
++ depends on PCI
++ help
++ This driver supports QLogic ISP3XXX gigabit Ethernet cards.
++
++ To compile this driver as a module, choose M here: the module
++ will be called qla3xxx.
++
++config ATL1
++ tristate "Atheros/Attansic L1 Gigabit Ethernet support"
++ depends on PCI
++ select CRC32
++ select MII
++ help
++ This driver supports the Atheros/Attansic L1 gigabit ethernet
++ adapter.
++
++ To compile this driver as a module, choose M here. The module
++ will be called atl1.
++
++config ATL1E
++ tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
++ depends on PCI && EXPERIMENTAL
++ select CRC32
++ select MII
++ help
++ This driver supports the Atheros L1E gigabit ethernet adapter.
++
++ To compile this driver as a module, choose M here. The module
++ will be called atl1e.
++
++config ATL1C
++ tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
++ depends on PCI && EXPERIMENTAL
++ select CRC32
++ select MII
++ help
++ This driver supports the Atheros L1C gigabit ethernet adapter.
++
++ To compile this driver as a module, choose M here. The module
++ will be called atl1c.
++
++config JME
++ tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
++ depends on PCI
++ select CRC32
++ select MII
++ ---help---
++ This driver supports the PCI-Express gigabit ethernet adapters
++ based on JMicron JMC250 chipset.
++
++ To compile this driver as a module, choose M here. The module
++ will be called jme.
++
++config S6GMAC
++ tristate "S6105 GMAC ethernet support"
++ depends on XTENSA_VARIANT_S6000
++ select PHYLIB
++ help
++ This driver supports the on chip ethernet device on the
++ S6105 xtensa processor.
++
++ To compile this driver as a module, choose M here. The module
++ will be called s6gmac.
++
++source "drivers/net/stmmac/Kconfig"
++
++endif # NETDEV_1000
++
++#
++# 10 Gigabit Ethernet
++#
++
++menuconfig NETDEV_10000
++ bool "Ethernet (10000 Mbit)"
++ depends on !UML
++ default y
++ ---help---
++ Say Y here to get to see options for 10 Gigabit Ethernet drivers.
++ This option alone does not add any kernel code.
++
++ If you say N, all options in this submenu will be skipped and disabled.
++
++if NETDEV_10000
++
++config MDIO
++ tristate
++
++config CHELSIO_T1
++ tristate "Chelsio 10Gb Ethernet support"
++ depends on PCI
++ select CRC32
++ select MDIO
++ help
++ This driver supports Chelsio gigabit and 10-gigabit
++ Ethernet cards. More information about adapter features and
++ performance tuning is in <file:Documentation/networking/cxgb.txt>.
++
++ For general information about Chelsio and our products, visit
++ our website at <http://www.chelsio.com>.
++
++ For customer support, please visit our customer support page at
++ <http://www.chelsio.com/support.htm>.
++
++ Please send feedback to <linux-bugs@chelsio.com>.
++
++ To compile this driver as a module, choose M here: the module
++ will be called cxgb.
++
++config CHELSIO_T1_1G
++ bool "Chelsio gigabit Ethernet support"
++ depends on CHELSIO_T1
++ help
++ Enables support for Chelsio's gigabit Ethernet PCI cards. If you
++ are using only 10G cards say 'N' here.
++
++config CHELSIO_T3_DEPENDS
++ tristate
++ depends on PCI && INET
++ default y
++
++config CHELSIO_T3
++ tristate "Chelsio Communications T3 10Gb Ethernet support"
++ depends on CHELSIO_T3_DEPENDS
++ select FW_LOADER
++ select MDIO
++ help
++ This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
++ adapters.
++
++ For general information about Chelsio and our products, visit
++ our website at <http://www.chelsio.com>.
++
++ For customer support, please visit our customer support page at
++ <http://www.chelsio.com/support.htm>.
++
++ Please send feedback to <linux-bugs@chelsio.com>.
++
++ To compile this driver as a module, choose M here: the module
++ will be called cxgb3.
++
++config CHELSIO_T4_DEPENDS
++ tristate
++ depends on PCI && INET
++ default y
++
++config CHELSIO_T4
++ tristate "Chelsio Communications T4 Ethernet support"
++ depends on CHELSIO_T4_DEPENDS
++ select FW_LOADER
++ select MDIO
++ help
++ This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
++ adapters.
++
++ For general information about Chelsio and our products, visit
++ our website at <http://www.chelsio.com>.
++
++ For customer support, please visit our customer support page at
++ <http://www.chelsio.com/support.htm>.
++
++ Please send feedback to <linux-bugs@chelsio.com>.
++
++ To compile this driver as a module choose M here; the module
++ will be called cxgb4.
++
++config EHEA
++ tristate "eHEA Ethernet support"
++ depends on IBMEBUS && INET && SPARSEMEM
++ select INET_LRO
++ ---help---
++ This driver supports the IBM pSeries eHEA ethernet adapter.
++
++ To compile the driver as a module, choose M here. The module
++ will be called ehea.
++
++config ENIC
++ tristate "Cisco VIC Ethernet NIC Support"
++ depends on PCI && INET
++ select INET_LRO
++ help
++ This enables the support for the Cisco VIC Ethernet card.
++
++config IXGBE
++ tristate "Intel(R) 10GbE PCI Express adapters support"
++ depends on PCI && INET
++ select MDIO
++ ---help---
++ This driver supports Intel(R) 10GbE PCI Express family of
++ adapters. For more information on how to identify your adapter, go
++ to the Adapter & Driver ID Guide at:
++
++ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
++
++ For general information and support, go to the Intel support
++ website at:
++
++ <http://support.intel.com>
++
++ To compile this driver as a module, choose M here. The module
++ will be called ixgbe.
++
++config IXGBE_DCA
++ bool "Direct Cache Access (DCA) Support"
++ default y
++ depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
++ ---help---
++ Say Y here if you want to use Direct Cache Access (DCA) in the
++ driver. DCA is a method for warming the CPU cache before data
++ is used, with the intent of lessening the impact of cache misses.
++
++config IXGBE_DCB
++ bool "Data Center Bridging (DCB) Support"
++ default n
++ depends on IXGBE && DCB
++ ---help---
++ Say Y here if you want to use Data Center Bridging (DCB) in the
++ driver.
++
++ If unsure, say N.
++
++config IXGBEVF
++ tristate "Intel(R) 82599 Virtual Function Ethernet support"
++ depends on PCI_MSI
++ ---help---
++ This driver supports Intel(R) 82599 virtual functions. For more
++ information on how to identify your adapter, go to the Adapter &
++ Driver ID Guide at:
++
++ <http://support.intel.com/support/network/sb/CS-008441.htm>
++
++ For general information and support, go to the Intel support
++ website at:
++
++ <http://support.intel.com>
++
++ More specific information on configuring the driver is in
++ <file:Documentation/networking/ixgbevf.txt>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ixgbevf. MSI-X interrupt support is required
++ for this driver to work correctly.
++
++config IXGB
++ tristate "Intel(R) PRO/10GbE support"
++ depends on PCI
++ ---help---
++ This driver supports Intel(R) PRO/10GbE family of adapters for
++ PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver
++ instead. For more information on how to identify your adapter, go
++ to the Adapter & Driver ID Guide at:
++
++ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
++
++ For general information and support, go to the Intel support
++ website at:
++
++ <http://support.intel.com>
++
++ More specific information on configuring the driver is in
++ <file:Documentation/networking/ixgb.txt>.
++
++ To compile this driver as a module, choose M here. The module
++ will be called ixgb.
++
++config S2IO
++ tristate "S2IO 10Gbe XFrame NIC"
++ depends on PCI
++ ---help---
++ This driver supports the 10Gbe XFrame NIC of S2IO.
++ More specific information on configuring the driver is in
++ <file:Documentation/networking/s2io.txt>.
++
++config VXGE
++ tristate "Neterion X3100 Series 10GbE PCIe Server Adapter"
++ depends on PCI && INET
++ ---help---
++ This driver supports Neterion Inc's X3100 Series 10 GbE PCIe
++ I/O Virtualized Server Adapter.
++ More specific information on configuring the driver is in
++ <file:Documentation/networking/vxge.txt>.
++
++config VXGE_DEBUG_TRACE_ALL
++ bool "Enabling All Debug trace statments in driver"
++ default n
++ depends on VXGE
++ ---help---
++ Say Y here if you want to enabling all the debug trace statements in
++ driver. By default only few debug trace statements are enabled.
++
++config MYRI10GE
++ tristate "Myricom Myri-10G Ethernet support"
++ depends on PCI && INET
++ select FW_LOADER
++ select CRC32
++ select INET_LRO
++ ---help---
++ This driver supports Myricom Myri-10G Dual Protocol interface in
++ Ethernet mode. If the eeprom on your board is not recent enough,
++ you will need a newer firmware image.
++ You may get this image or more information, at:
++
++ <http://www.myri.com/scs/download-Myri10GE.html>
++
++ To compile this driver as a module, choose M here. The module
++ will be called myri10ge.
++
++config MYRI10GE_DCA
++ bool "Direct Cache Access (DCA) Support"
++ default y
++ depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
++ ---help---
++ Say Y here if you want to use Direct Cache Access (DCA) in the
++ driver. DCA is a method for warming the CPU cache before data
++ is used, with the intent of lessening the impact of cache misses.
++
++config NETXEN_NIC
++ tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
++ depends on PCI
++ select FW_LOADER
++ help
++ This enables the support for NetXen's Gigabit Ethernet card.
++
++config NIU
++ tristate "Sun Neptune 10Gbit Ethernet support"
++ depends on PCI
++ select CRC32
++ help
++ This enables support for cards based upon Sun's
++ Neptune chipset.
++
++config PASEMI_MAC
++ tristate "PA Semi 1/10Gbit MAC"
++ depends on PPC_PASEMI && PCI
++ select PHYLIB
++ select INET_LRO
++ help
++ This driver supports the on-chip 1/10Gbit Ethernet controller on
++ PA Semi's PWRficient line of chips.
++
++config MLX4_EN
++ tristate "Mellanox Technologies 10Gbit Ethernet support"
++ depends on PCI && INET
++ select MLX4_CORE
++ select INET_LRO
++ help
++ This driver supports Mellanox Technologies ConnectX Ethernet
++ devices.
++
++config MLX4_CORE
++ tristate
++ depends on PCI
++ default n
++
++config MLX4_DEBUG
++ bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
++ depends on MLX4_CORE
++ default y
++ ---help---
++ This option causes debugging code to be compiled into the
++ mlx4_core driver. The output can be turned on via the
++ debug_level module parameter (which can also be set after
++ the driver is loaded through sysfs).
++
++config TEHUTI
++ tristate "Tehuti Networks 10G Ethernet"
++ depends on PCI
++ help
++ Tehuti Networks 10G Ethernet NIC
++
++config BNX2X
++ tristate "Broadcom NetXtremeII 10Gb support"
++ depends on PCI
++ select FW_LOADER
++ select ZLIB_INFLATE
++ select LIBCRC32C
++ select MDIO
++ help
++ This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
++ To compile this driver as a module, choose M here: the module
++ will be called bnx2x. This is recommended.
++
++config QLCNIC
++ tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
++ depends on PCI
++ select FW_LOADER
++ help
++ This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
++ devices.
++
++config QLGE
++ tristate "QLogic QLGE 10Gb Ethernet Driver Support"
++ depends on PCI
++ help
++ This driver supports QLogic ISP8XXX 10Gb Ethernet cards.
++
++ To compile this driver as a module, choose M here: the module
++ will be called qlge.
++
++source "drivers/net/sfc/Kconfig"
++
++source "drivers/net/benet/Kconfig"
++
++endif # NETDEV_10000
++
++source "drivers/net/tokenring/Kconfig"
++
++source "drivers/net/wireless/Kconfig"
++
++source "drivers/net/wimax/Kconfig"
++
++source "drivers/net/usb/Kconfig"
++
++source "drivers/net/pcmcia/Kconfig"
++
++source "drivers/net/wan/Kconfig"
++
++source "drivers/atm/Kconfig"
++
++source "drivers/ieee802154/Kconfig"
++
++source "drivers/s390/net/Kconfig"
++
++source "drivers/net/caif/Kconfig"
++
++config XEN_NETDEV_FRONTEND
++ tristate "Xen network device frontend driver"
++ depends on XEN
++ default y
++ help
++ The network device frontend driver allows the kernel to
++ access network devices exported exported by a virtual
++ machine containing a physical network device driver. The
++ frontend driver is intended for unprivileged guest domains;
++ if you are compiling a kernel for a Xen guest, you almost
++ certainly want to enable this.
++
++config ISERIES_VETH
++ tristate "iSeries Virtual Ethernet driver support"
++ depends on PPC_ISERIES
++
++config RIONET
++ tristate "RapidIO Ethernet over messaging driver support"
++ depends on RAPIDIO
++
++config RIONET_TX_SIZE
++ int "Number of outbound queue entries"
++ depends on RIONET
++ default "128"
++
++config RIONET_RX_SIZE
++ int "Number of inbound queue entries"
++ depends on RIONET
++ default "128"
++
++config FDDI
++ tristate "FDDI driver support"
++ depends on (PCI || EISA || TC)
++ help
++ Fiber Distributed Data Interface is a high speed local area network
++ design; essentially a replacement for high speed Ethernet. FDDI can
++ run over copper or fiber. If you are connected to such a network and
++ want a driver for the FDDI card in your computer, say Y here (and
++ then also Y to the driver for your FDDI card, below). Most people
++ will say N.
++
++config DEFXX
++ tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
++ depends on FDDI && (PCI || EISA || TC)
++ ---help---
++ This is support for the DIGITAL series of TURBOchannel (DEFTA),
++ EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
++ to a local FDDI network.
++
++ To compile this driver as a module, choose M here: the module
++ will be called defxx. If unsure, say N.
++
++config DEFXX_MMIO
++ bool
++ prompt "Use MMIO instead of PIO" if PCI || EISA
++ depends on DEFXX
++ default n if PCI || EISA
++ default y
++ ---help---
++ This instructs the driver to use EISA or PCI memory-mapped I/O
++ (MMIO) as appropriate instead of programmed I/O ports (PIO).
++ Enabling this gives an improvement in processing time in parts
++ of the driver, but it may cause problems with EISA (DEFEA)
++ adapters. TURBOchannel does not have the concept of I/O ports,
++ so MMIO is always used for these (DEFTA) adapters.
++
++ If unsure, say N.
++
++config SKFP
++ tristate "SysKonnect FDDI PCI support"
++ depends on FDDI && PCI
++ select BITREVERSE
++ ---help---
++ Say Y here if you have a SysKonnect FDDI PCI adapter.
++ The following adapters are supported by this driver:
++ - SK-5521 (SK-NET FDDI-UP)
++ - SK-5522 (SK-NET FDDI-UP DAS)
++ - SK-5541 (SK-NET FDDI-FP)
++ - SK-5543 (SK-NET FDDI-LP)
++ - SK-5544 (SK-NET FDDI-LP DAS)
++ - SK-5821 (SK-NET FDDI-UP64)
++ - SK-5822 (SK-NET FDDI-UP64 DAS)
++ - SK-5841 (SK-NET FDDI-FP64)
++ - SK-5843 (SK-NET FDDI-LP64)
++ - SK-5844 (SK-NET FDDI-LP64 DAS)
++ - Netelligent 100 FDDI DAS Fibre SC
++ - Netelligent 100 FDDI SAS Fibre SC
++ - Netelligent 100 FDDI DAS UTP
++ - Netelligent 100 FDDI SAS UTP
++ - Netelligent 100 FDDI SAS Fibre MIC
++
++ Read <file:Documentation/networking/skfp.txt> for information about
++ the driver.
++
++ Questions concerning this driver can be addressed to:
++ <linux@syskonnect.de>
++
++ To compile this driver as a module, choose M here: the module
++ will be called skfp. This is recommended.
++
++config HIPPI
++ bool "HIPPI driver support (EXPERIMENTAL)"
++ depends on EXPERIMENTAL && INET && PCI
++ help
++ HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and
++ 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI
++ can run over copper (25m) or fiber (300m on multi-mode or 10km on
++ single-mode). HIPPI networks are commonly used for clusters and to
++ connect to super computers. If you are connected to a HIPPI network
++ and have a HIPPI network card in your computer that you want to use
++ under Linux, say Y here (you must also remember to enable the driver
++ for your HIPPI card below). Most people will say N here.
++
++config ROADRUNNER
++ tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)"
++ depends on HIPPI && PCI
++ help
++ Say Y here if this is your PCI HIPPI network card.
++
++ To compile this driver as a module, choose M here: the module
++ will be called rrunner. If unsure, say N.
++
++config ROADRUNNER_LARGE_RINGS
++ bool "Use large TX/RX rings (EXPERIMENTAL)"
++ depends on ROADRUNNER
++ help
++ If you say Y here, the RoadRunner driver will preallocate up to 2 MB
++ of additional memory to allow for fastest operation, both for
++ transmitting and receiving. This memory cannot be used by any other
++ kernel code or by user space programs. Say Y here only if you have
++ the memory.
++
++config PLIP
++ tristate "PLIP (parallel port) support"
++ depends on PARPORT
++ ---help---
++ PLIP (Parallel Line Internet Protocol) is used to create a
++ reasonably fast mini network consisting of two (or, rarely, more)
++ local machines. A PLIP link from a Linux box is a popular means to
++ install a Linux distribution on a machine which doesn't have a
++ CD-ROM drive (a minimal system has to be transferred with floppies
++ first). The kernels on both machines need to have this PLIP option
++ enabled for this to work.
++
++ The PLIP driver has two modes, mode 0 and mode 1. The parallel
++ ports (the connectors at the computers with 25 holes) are connected
++ with "null printer" or "Turbo Laplink" cables which can transmit 4
++ bits at a time (mode 0) or with special PLIP cables, to be used on
++ bidirectional parallel ports only, which can transmit 8 bits at a
++ time (mode 1); you can find the wiring of these cables in
++ <file:Documentation/networking/PLIP.txt>. The cables can be up to
++ 15m long. Mode 0 works also if one of the machines runs DOS/Windows
++ and has some PLIP software installed, e.g. the Crynwr PLIP packet
++ driver (<http://oak.oakland.edu/simtel.net/msdos/pktdrvr-pre.html>)
++ and winsock or NCSA's telnet.
++
++ If you want to use PLIP, say Y and read the PLIP mini-HOWTO as well
++ as the NET-3-HOWTO, both available from
++ <http://www.tldp.org/docs.html#howto>. Note that the PLIP
++ protocol has been changed and this PLIP driver won't work together
++ with the PLIP support in Linux versions 1.0.x. This option enlarges
++ your kernel by about 8 KB.
++
++ To compile this driver as a module, choose M here. The module
++ will be called plip. If unsure, say Y or M, in case you buy
++ a laptop later.
++
++config PPP
++ tristate "PPP (point-to-point protocol) support"
++ select SLHC
++ ---help---
++ PPP (Point to Point Protocol) is a newer and better SLIP. It serves
++ the same purpose: sending Internet traffic over telephone (and other
++ serial) lines. Ask your access provider if they support it, because
++ otherwise you can't use it; most Internet access providers these
++ days support PPP rather than SLIP.
++
++ To use PPP, you need an additional program called pppd as described
++ in the PPP-HOWTO, available at
++ <http://www.tldp.org/docs.html#howto>. Make sure that you have
++ the version of pppd recommended in <file:Documentation/Changes>.
++ The PPP option enlarges your kernel by about 16 KB.
++
++ There are actually two versions of PPP: the traditional PPP for
++ asynchronous lines, such as regular analog phone lines, and
++ synchronous PPP which can be used over digital ISDN lines for
++ example. If you want to use PPP over phone lines or other
++ asynchronous serial lines, you need to say Y (or M) here and also to
++ the next option, "PPP support for async serial ports". For PPP over
++ synchronous lines, you should say Y (or M) here and to "Support
++ synchronous PPP", below.
++
++ If you said Y to "Version information on all symbols" above, then
++ you cannot compile the PPP driver into the kernel; you can then only
++ compile it as a module. To compile this driver as a module, choose M
++ here. The module will be called ppp_generic.
++
++config PPP_MULTILINK
++ bool "PPP multilink support (EXPERIMENTAL)"
++ depends on PPP && EXPERIMENTAL
++ help
++ PPP multilink is a protocol (defined in RFC 1990) which allows you
++ to combine several (logical or physical) lines into one logical PPP
++ connection, so that you can utilize your full bandwidth.
++
++ This has to be supported at the other end as well and you need a
++ version of the pppd daemon which understands the multilink protocol.
++
++ If unsure, say N.
++
++config PPP_FILTER
++ bool "PPP filtering"
++ depends on PPP
++ help
++ Say Y here if you want to be able to filter the packets passing over
++ PPP interfaces. This allows you to control which packets count as
++ activity (i.e. which packets will reset the idle timer or bring up
++ a demand-dialed link) and which packets are to be dropped entirely.
++ You need to say Y here if you wish to use the pass-filter and
++ active-filter options to pppd.
++
++ If unsure, say N.
++
++config PPP_ASYNC
++ tristate "PPP support for async serial ports"
++ depends on PPP
++ select CRC_CCITT
++ ---help---
++ Say Y (or M) here if you want to be able to use PPP over standard
++ asynchronous serial ports, such as COM1 or COM2 on a PC. If you use
++ a modem (not a synchronous or ISDN modem) to contact your ISP, you
++ need this option.
++
++ To compile this driver as a module, choose M here.
++
++ If unsure, say Y.
++
++config PPP_SYNC_TTY
++ tristate "PPP support for sync tty ports"
++ depends on PPP
++ help
++ Say Y (or M) here if you want to be able to use PPP over synchronous
++ (HDLC) tty devices, such as the SyncLink adapter. These devices
++ are often used for high-speed leased lines like T1/E1.
++
++ To compile this driver as a module, choose M here.
++
++config PPP_DEFLATE
++ tristate "PPP Deflate compression"
++ depends on PPP
++ select ZLIB_INFLATE
++ select ZLIB_DEFLATE
++ ---help---
++ Support for the Deflate compression method for PPP, which uses the
++ Deflate algorithm (the same algorithm that gzip uses) to compress
++ each PPP packet before it is sent over the wire. The machine at the
++ other end of the PPP link (usually your ISP) has to support the
++ Deflate compression method as well for this to be useful. Even if
++ they don't support it, it is safe to say Y here.
++
++ To compile this driver as a module, choose M here.
++
++config PPP_BSDCOMP
++ tristate "PPP BSD-Compress compression"
++ depends on PPP
++ ---help---
++ Support for the BSD-Compress compression method for PPP, which uses
++ the LZW compression method to compress each PPP packet before it is
++ sent over the wire. The machine at the other end of the PPP link
++ (usually your ISP) has to support the BSD-Compress compression
++ method as well for this to be useful. Even if they don't support it,
++ it is safe to say Y here.
++
++ The PPP Deflate compression method ("PPP Deflate compression",
++ above) is preferable to BSD-Compress, because it compresses better
++ and is patent-free.
++
++ Note that the BSD compression code will always be compiled as a
++ module; it is called bsd_comp and will show up in the directory
++ modules once you have said "make modules". If unsure, say N.
++
++config PPP_MPPE
++ tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
++ depends on PPP && EXPERIMENTAL
++ select CRYPTO
++ select CRYPTO_SHA1
++ select CRYPTO_ARC4
++ select CRYPTO_ECB
++ ---help---
++ Support for the MPPE Encryption protocol, as employed by the
++ Microsoft Point-to-Point Tunneling Protocol.
++
++ See http://pptpclient.sourceforge.net/ for information on
++ configuring PPTP clients and servers to utilize this method.
++
++config PPPOE
++ tristate "PPP over Ethernet (EXPERIMENTAL)"
++ depends on EXPERIMENTAL && PPP
++ help
++ Support for PPP over Ethernet.
++
++ This driver requires the latest version of pppd from the CVS
++ repository at cvs.samba.org. Alternatively, see the
++ RoaringPenguin package (<http://www.roaringpenguin.com/pppoe>)
++ which contains instruction on how to use this driver (under
++ the heading "Kernel mode PPPoE").
++
++config PPPOATM
++ tristate "PPP over ATM"
++ depends on ATM && PPP
++ help
++ Support PPP (Point to Point Protocol) encapsulated in ATM frames.
++ This implementation does not yet comply with section 8 of RFC2364,
++ which can lead to bad results if the ATM peer loses state and
++ changes its encapsulation unilaterally.
++
++config PPPOL2TP
++ tristate "PPP over L2TP (EXPERIMENTAL)"
++ depends on EXPERIMENTAL && L2TP && PPP
++ help
++ Support for PPP-over-L2TP socket family. L2TP is a protocol
++ used by ISPs and enterprises to tunnel PPP traffic over UDP
++ tunnels. L2TP is replacing PPTP for VPN uses.
++
++config SLIP
++ tristate "SLIP (serial line) support"
++ ---help---
++ Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
++ connect to your Internet service provider or to connect to some
++ other local Unix box or if you want to configure your Linux box as a
++ Slip/CSlip server for other people to dial in. SLIP (Serial Line
++ Internet Protocol) is a protocol used to send Internet traffic over
++ serial connections such as telephone lines or null modem cables;
++ nowadays, the protocol PPP is more commonly used for this same
++ purpose.
++
++ Normally, your access provider has to support SLIP in order for you
++ to be able to use it, but there is now a SLIP emulator called SLiRP
++ around (available from
++ <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
++ allows you to use SLIP over a regular dial up shell connection. If
++ you plan to use SLiRP, make sure to say Y to CSLIP, below. The
++ NET-3-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>, explains how to
++ configure SLIP. Note that you don't need this option if you just
++ want to run term (term is a program which gives you almost full
++ Internet connectivity if you have a regular dial up shell account on
++ some Internet connected Unix computer. Read
++ <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP
++ support will enlarge your kernel by about 4 KB. If unsure, say N.
++
++ To compile this driver as a module, choose M here. The module
++ will be called slip.
++
++config SLIP_COMPRESSED
++ bool "CSLIP compressed headers"
++ depends on SLIP
++ select SLHC
++ ---help---
++ This protocol is faster than SLIP because it uses compression on the
++ TCP/IP headers (not on the data itself), but it has to be supported
++ on both ends. Ask your access provider if you are not sure and
++ answer Y, just in case. You will still be able to use plain SLIP. If
++ you plan to use SLiRP, the SLIP emulator (available from
++ <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which
++ allows you to use SLIP over a regular dial up shell connection, you
++ definitely want to say Y here. The NET-3-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>, explains how to configure
++ CSLIP. This won't enlarge your kernel.
++
++config SLHC
++ tristate
++ help
++ This option enables Van Jacobsen serial line header compression
++ routines.
++
++config SLIP_SMART
++ bool "Keepalive and linefill"
++ depends on SLIP
++ help
++ Adds additional capabilities to the SLIP driver to support the
++ RELCOM line fill and keepalive monitoring. Ideal on poor quality
++ analogue lines.
++
++config SLIP_MODE_SLIP6
++ bool "Six bit SLIP encapsulation"
++ depends on SLIP
++ help
++ Just occasionally you may need to run IP over hostile serial
++ networks that don't pass all control characters or are only seven
++ bit. Saying Y here adds an extra mode you can use with SLIP:
++ "slip6". In this mode, SLIP will only send normal ASCII symbols over
++ the serial device. Naturally, this has to be supported at the other
++ end of the link as well. It's good enough, for example, to run IP
++ over the async ports of a Camtec JNT Pad. If unsure, say N.
++
++config NET_FC
++ bool "Fibre Channel driver support"
++ depends on SCSI && PCI
++ help
++ Fibre Channel is a high speed serial protocol mainly used to connect
++ large storage devices to the computer; it is compatible with and
++ intended to replace SCSI.
++
++ If you intend to use Fibre Channel, you need to have a Fibre channel
++ adaptor card in your computer; say Y here and to the driver for your
++ adaptor below. You also should have said Y to "SCSI support" and
++ "SCSI generic support".
++
++config NETCONSOLE
++ tristate "Network console logging support"
++ ---help---
++ If you want to log kernel messages over the network, enable this.
++ See <file:Documentation/networking/netconsole.txt> for details.
++
++config NETCONSOLE_DYNAMIC
++ bool "Dynamic reconfiguration of logging targets"
++ depends on NETCONSOLE && SYSFS
++ select CONFIGFS_FS
++ help
++ This option enables the ability to dynamically reconfigure target
++ parameters (interface, IP addresses, port numbers, MAC addresses)
++ at runtime through a userspace interface exported using configfs.
++ See <file:Documentation/networking/netconsole.txt> for details.
++
++config NETPOLL
++ def_bool NETCONSOLE
++
++config NETPOLL_TRAP
++ bool "Netpoll traffic trapping"
++ default n
++ depends on NETPOLL
++
++config NET_POLL_CONTROLLER
++ def_bool NETPOLL
++
++config VIRTIO_NET
++ tristate "Virtio network driver (EXPERIMENTAL)"
++ depends on EXPERIMENTAL && VIRTIO
++ ---help---
++ This is the virtual network driver for virtio. It can be used with
++ lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
++
++config VMXNET3
++ tristate "VMware VMXNET3 ethernet driver"
++ depends on PCI && INET
++ help
++ This driver supports VMware's vmxnet3 virtual ethernet NIC.
++ To compile this driver as a module, choose M here: the
++ module will be called vmxnet3.
++
++endif # NETDEVICES
+diff -Nur linux-2.6.35.7.orig/drivers/net/Makefile linux-2.6.35.7/drivers/net/Makefile
+--- linux-2.6.35.7.orig/drivers/net/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/net/Makefile 2010-10-14 20:28:00.878101155 +0200
@@ -109,6 +109,7 @@
# end link order section
#
@@ -14888,9 +22256,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/Makefile linux-2.6.34/drivers/net/Makefi
obj-$(CONFIG_SUNDANCE) += sundance.o
obj-$(CONFIG_HAMACHI) += hamachi.o
obj-$(CONFIG_NET) += Space.o loopback.o
-diff -Nur linux-2.6.34.orig/drivers/net/phy/Kconfig linux-2.6.34/drivers/net/phy/Kconfig
---- linux-2.6.34.orig/drivers/net/phy/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/net/phy/Kconfig 2010-05-25 18:46:09.863473083 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/phy/Kconfig linux-2.6.35.7/drivers/net/phy/Kconfig
+--- linux-2.6.35.7.orig/drivers/net/phy/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/net/phy/Kconfig 2010-10-14 20:28:00.918101155 +0200
@@ -93,6 +93,10 @@
---help---
Supports the KSZ9021, VSC8201, KS8001 PHYs.
@@ -14902,9 +22270,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/phy/Kconfig linux-2.6.34/drivers/net/phy
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y
-diff -Nur linux-2.6.34.orig/drivers/net/phy/phy.c linux-2.6.34/drivers/net/phy/phy.c
---- linux-2.6.34.orig/drivers/net/phy/phy.c 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/net/phy/phy.c 2010-05-25 18:46:12.573473234 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy.c linux-2.6.35.7/drivers/net/phy/phy.c
+--- linux-2.6.35.7.orig/drivers/net/phy/phy.c 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/net/phy/phy.c 2010-10-14 20:28:00.948101153 +0200
@@ -298,6 +298,50 @@
}
EXPORT_SYMBOL(phy_ethtool_gset);
@@ -14974,9 +22342,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/phy/phy.c linux-2.6.34/drivers/net/phy/p
idx++;
idx = phy_find_valid(idx, phydev->supported);
-diff -Nur linux-2.6.34.orig/drivers/net/phy/phy_device.c linux-2.6.34/drivers/net/phy/phy_device.c
---- linux-2.6.34.orig/drivers/net/phy/phy_device.c 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/net/phy/phy_device.c 2010-05-25 18:46:12.660978620 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy_device.c linux-2.6.35.7/drivers/net/phy/phy_device.c
+--- linux-2.6.35.7.orig/drivers/net/phy/phy_device.c 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/net/phy/phy_device.c 2010-10-14 20:28:01.005039092 +0200
@@ -146,6 +146,18 @@
}
EXPORT_SYMBOL(phy_scan_fixups);
@@ -14996,7 +22364,7 @@ diff -Nur linux-2.6.34.orig/drivers/net/phy/phy_device.c linux-2.6.34/drivers/ne
struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
{
struct phy_device *dev;
-@@ -175,6 +187,8 @@
+@@ -176,6 +188,8 @@
dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
dev->state = PHY_DOWN;
@@ -15005,9 +22373,1054 @@ diff -Nur linux-2.6.34.orig/drivers/net/phy/phy_device.c linux-2.6.34/drivers/ne
mutex_init(&dev->lock);
INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
-diff -Nur linux-2.6.34.orig/drivers/spi/ap83_spi.c linux-2.6.34/drivers/spi/ap83_spi.c
---- linux-2.6.34.orig/drivers/spi/ap83_spi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/spi/ap83_spi.c 2010-05-25 18:46:12.703464112 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/phy/phy_device.c.orig linux-2.6.35.7/drivers/net/phy/phy_device.c.orig
+--- linux-2.6.35.7.orig/drivers/net/phy/phy_device.c.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/net/phy/phy_device.c.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,1041 @@
++/*
++ * drivers/net/phy/phy_device.c
++ *
++ * Framework for finding and configuring PHYs.
++ * Also contains generic PHY driver
++ *
++ * Author: Andy Fleming
++ *
++ * Copyright (c) 2004 Freescale Semiconductor, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ */
++#include <linux/kernel.h>
++#include <linux/string.h>
++#include <linux/errno.h>
++#include <linux/unistd.h>
++#include <linux/slab.h>
++#include <linux/interrupt.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/skbuff.h>
++#include <linux/mm.h>
++#include <linux/module.h>
++#include <linux/mii.h>
++#include <linux/ethtool.h>
++#include <linux/phy.h>
++
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <asm/uaccess.h>
++
++MODULE_DESCRIPTION("PHY library");
++MODULE_AUTHOR("Andy Fleming");
++MODULE_LICENSE("GPL");
++
++void phy_device_free(struct phy_device *phydev)
++{
++ kfree(phydev);
++}
++EXPORT_SYMBOL(phy_device_free);
++
++static void phy_device_release(struct device *dev)
++{
++ phy_device_free(to_phy_device(dev));
++}
++
++static struct phy_driver genphy_driver;
++extern int mdio_bus_init(void);
++extern void mdio_bus_exit(void);
++
++static LIST_HEAD(phy_fixup_list);
++static DEFINE_MUTEX(phy_fixup_lock);
++
++/*
++ * Creates a new phy_fixup and adds it to the list
++ * @bus_id: A string which matches phydev->dev.bus_id (or PHY_ANY_ID)
++ * @phy_uid: Used to match against phydev->phy_id (the UID of the PHY)
++ * It can also be PHY_ANY_UID
++ * @phy_uid_mask: Applied to phydev->phy_id and fixup->phy_uid before
++ * comparison
++ * @run: The actual code to be run when a matching PHY is found
++ */
++int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
++ int (*run)(struct phy_device *))
++{
++ struct phy_fixup *fixup;
++
++ fixup = kzalloc(sizeof(struct phy_fixup), GFP_KERNEL);
++ if (!fixup)
++ return -ENOMEM;
++
++ strlcpy(fixup->bus_id, bus_id, sizeof(fixup->bus_id));
++ fixup->phy_uid = phy_uid;
++ fixup->phy_uid_mask = phy_uid_mask;
++ fixup->run = run;
++
++ mutex_lock(&phy_fixup_lock);
++ list_add_tail(&fixup->list, &phy_fixup_list);
++ mutex_unlock(&phy_fixup_lock);
++
++ return 0;
++}
++EXPORT_SYMBOL(phy_register_fixup);
++
++/* Registers a fixup to be run on any PHY with the UID in phy_uid */
++int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,
++ int (*run)(struct phy_device *))
++{
++ return phy_register_fixup(PHY_ANY_ID, phy_uid, phy_uid_mask, run);
++}
++EXPORT_SYMBOL(phy_register_fixup_for_uid);
++
++/* Registers a fixup to be run on the PHY with id string bus_id */
++int phy_register_fixup_for_id(const char *bus_id,
++ int (*run)(struct phy_device *))
++{
++ return phy_register_fixup(bus_id, PHY_ANY_UID, 0xffffffff, run);
++}
++EXPORT_SYMBOL(phy_register_fixup_for_id);
++
++/*
++ * Returns 1 if fixup matches phydev in bus_id and phy_uid.
++ * Fixups can be set to match any in one or more fields.
++ */
++static int phy_needs_fixup(struct phy_device *phydev, struct phy_fixup *fixup)
++{
++ if (strcmp(fixup->bus_id, dev_name(&phydev->dev)) != 0)
++ if (strcmp(fixup->bus_id, PHY_ANY_ID) != 0)
++ return 0;
++
++ if ((fixup->phy_uid & fixup->phy_uid_mask) !=
++ (phydev->phy_id & fixup->phy_uid_mask))
++ if (fixup->phy_uid != PHY_ANY_UID)
++ return 0;
++
++ return 1;
++}
++
++/* Runs any matching fixups for this phydev */
++int phy_scan_fixups(struct phy_device *phydev)
++{
++ struct phy_fixup *fixup;
++
++ mutex_lock(&phy_fixup_lock);
++ list_for_each_entry(fixup, &phy_fixup_list, list) {
++ if (phy_needs_fixup(phydev, fixup)) {
++ int err;
++
++ err = fixup->run(phydev);
++
++ if (err < 0) {
++ mutex_unlock(&phy_fixup_lock);
++ return err;
++ }
++ }
++ }
++ mutex_unlock(&phy_fixup_lock);
++
++ return 0;
++}
++EXPORT_SYMBOL(phy_scan_fixups);
++
++struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
++{
++ struct phy_device *dev;
++
++ /* We allocate the device, and initialize the
++ * default values */
++ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
++
++ if (NULL == dev)
++ return (struct phy_device*) PTR_ERR((void*)-ENOMEM);
++
++ dev->dev.release = phy_device_release;
++
++ dev->speed = 0;
++ dev->duplex = -1;
++ dev->pause = dev->asym_pause = 0;
++ dev->link = 1;
++ dev->interface = PHY_INTERFACE_MODE_GMII;
++
++ dev->autoneg = AUTONEG_ENABLE;
++
++ dev->addr = addr;
++ dev->phy_id = phy_id;
++ dev->bus = bus;
++ dev->dev.parent = bus->parent;
++ dev->dev.bus = &mdio_bus_type;
++ dev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL;
++ dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
++
++ dev->state = PHY_DOWN;
++
++ mutex_init(&dev->lock);
++ INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
++
++ /* Request the appropriate module unconditionally; don't
++ bother trying to do so only if it isn't already loaded,
++ because that gets complicated. A hotplug event would have
++ done an unconditional modprobe anyway.
++ We don't do normal hotplug because it won't work for MDIO
++ -- because it relies on the device staying around for long
++ enough for the driver to get loaded. With MDIO, the NIC
++ driver will get bored and give up as soon as it finds that
++ there's no driver _already_ loaded. */
++ request_module(MDIO_MODULE_PREFIX MDIO_ID_FMT, MDIO_ID_ARGS(phy_id));
++
++ return dev;
++}
++EXPORT_SYMBOL(phy_device_create);
++
++/**
++ * get_phy_id - reads the specified addr for its ID.
++ * @bus: the target MII bus
++ * @addr: PHY address on the MII bus
++ * @phy_id: where to store the ID retrieved.
++ *
++ * Description: Reads the ID registers of the PHY at @addr on the
++ * @bus, stores it in @phy_id and returns zero on success.
++ */
++int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
++{
++ int phy_reg;
++
++ /* Grab the bits from PHYIR1, and put them
++ * in the upper half */
++ phy_reg = bus->read(bus, addr, MII_PHYSID1);
++
++ if (phy_reg < 0)
++ return -EIO;
++
++ *phy_id = (phy_reg & 0xffff) << 16;
++
++ /* Grab the bits from PHYIR2, and put them in the lower half */
++ phy_reg = bus->read(bus, addr, MII_PHYSID2);
++
++ if (phy_reg < 0)
++ return -EIO;
++
++ *phy_id |= (phy_reg & 0xffff);
++
++ return 0;
++}
++EXPORT_SYMBOL(get_phy_id);
++
++/**
++ * get_phy_device - reads the specified PHY device and returns its @phy_device struct
++ * @bus: the target MII bus
++ * @addr: PHY address on the MII bus
++ *
++ * Description: Reads the ID registers of the PHY at @addr on the
++ * @bus, then allocates and returns the phy_device to represent it.
++ */
++struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
++{
++ struct phy_device *dev = NULL;
++ u32 phy_id;
++ int r;
++
++ r = get_phy_id(bus, addr, &phy_id);
++ if (r)
++ return ERR_PTR(r);
++
++ /* If the phy_id is mostly Fs, there is no device there */
++ if ((phy_id & 0x1fffffff) == 0x1fffffff)
++ return NULL;
++
++ dev = phy_device_create(bus, addr, phy_id);
++
++ return dev;
++}
++EXPORT_SYMBOL(get_phy_device);
++
++/**
++ * phy_device_register - Register the phy device on the MDIO bus
++ * @phydev: phy_device structure to be added to the MDIO bus
++ */
++int phy_device_register(struct phy_device *phydev)
++{
++ int err;
++
++ /* Don't register a phy if one is already registered at this
++ * address */
++ if (phydev->bus->phy_map[phydev->addr])
++ return -EINVAL;
++ phydev->bus->phy_map[phydev->addr] = phydev;
++
++ /* Run all of the fixups for this PHY */
++ phy_scan_fixups(phydev);
++
++ err = device_register(&phydev->dev);
++ if (err) {
++ pr_err("phy %d failed to register\n", phydev->addr);
++ goto out;
++ }
++
++ return 0;
++
++ out:
++ phydev->bus->phy_map[phydev->addr] = NULL;
++ return err;
++}
++EXPORT_SYMBOL(phy_device_register);
++
++/**
++ * phy_find_first - finds the first PHY device on the bus
++ * @bus: the target MII bus
++ */
++struct phy_device *phy_find_first(struct mii_bus *bus)
++{
++ int addr;
++
++ for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
++ if (bus->phy_map[addr])
++ return bus->phy_map[addr];
++ }
++ return NULL;
++}
++EXPORT_SYMBOL(phy_find_first);
++
++/**
++ * phy_prepare_link - prepares the PHY layer to monitor link status
++ * @phydev: target phy_device struct
++ * @handler: callback function for link status change notifications
++ *
++ * Description: Tells the PHY infrastructure to handle the
++ * gory details on monitoring link status (whether through
++ * polling or an interrupt), and to call back to the
++ * connected device driver when the link status changes.
++ * If you want to monitor your own link state, don't call
++ * this function.
++ */
++void phy_prepare_link(struct phy_device *phydev,
++ void (*handler)(struct net_device *))
++{
++ phydev->adjust_link = handler;
++}
++
++/**
++ * phy_connect_direct - connect an ethernet device to a specific phy_device
++ * @dev: the network device to connect
++ * @phydev: the pointer to the phy device
++ * @handler: callback function for state change notifications
++ * @flags: PHY device's dev_flags
++ * @interface: PHY device's interface
++ */
++int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
++ void (*handler)(struct net_device *), u32 flags,
++ phy_interface_t interface)
++{
++ int rc;
++
++ rc = phy_attach_direct(dev, phydev, flags, interface);
++ if (rc)
++ return rc;
++
++ phy_prepare_link(phydev, handler);
++ phy_start_machine(phydev, NULL);
++ if (phydev->irq > 0)
++ phy_start_interrupts(phydev);
++
++ return 0;
++}
++EXPORT_SYMBOL(phy_connect_direct);
++
++/**
++ * phy_connect - connect an ethernet device to a PHY device
++ * @dev: the network device to connect
++ * @bus_id: the id string of the PHY device to connect
++ * @handler: callback function for state change notifications
++ * @flags: PHY device's dev_flags
++ * @interface: PHY device's interface
++ *
++ * Description: Convenience function for connecting ethernet
++ * devices to PHY devices. The default behavior is for
++ * the PHY infrastructure to handle everything, and only notify
++ * the connected driver when the link status changes. If you
++ * don't want, or can't use the provided functionality, you may
++ * choose to call only the subset of functions which provide
++ * the desired functionality.
++ */
++struct phy_device * phy_connect(struct net_device *dev, const char *bus_id,
++ void (*handler)(struct net_device *), u32 flags,
++ phy_interface_t interface)
++{
++ struct phy_device *phydev;
++ struct device *d;
++ int rc;
++
++ /* Search the list of PHY devices on the mdio bus for the
++ * PHY with the requested name */
++ d = bus_find_device_by_name(&mdio_bus_type, NULL, bus_id);
++ if (!d) {
++ pr_err("PHY %s not found\n", bus_id);
++ return ERR_PTR(-ENODEV);
++ }
++ phydev = to_phy_device(d);
++
++ rc = phy_connect_direct(dev, phydev, handler, flags, interface);
++ if (rc)
++ return ERR_PTR(rc);
++
++ return phydev;
++}
++EXPORT_SYMBOL(phy_connect);
++
++/**
++ * phy_disconnect - disable interrupts, stop state machine, and detach a PHY device
++ * @phydev: target phy_device struct
++ */
++void phy_disconnect(struct phy_device *phydev)
++{
++ if (phydev->irq > 0)
++ phy_stop_interrupts(phydev);
++
++ phy_stop_machine(phydev);
++
++ phydev->adjust_link = NULL;
++
++ phy_detach(phydev);
++}
++EXPORT_SYMBOL(phy_disconnect);
++
++int phy_init_hw(struct phy_device *phydev)
++{
++ int ret;
++
++ if (!phydev->drv || !phydev->drv->config_init)
++ return 0;
++
++ ret = phy_scan_fixups(phydev);
++ if (ret < 0)
++ return ret;
++
++ return phydev->drv->config_init(phydev);
++}
++
++/**
++ * phy_attach_direct - attach a network device to a given PHY device pointer
++ * @dev: network device to attach
++ * @phydev: Pointer to phy_device to attach
++ * @flags: PHY device's dev_flags
++ * @interface: PHY device's interface
++ *
++ * Description: Called by drivers to attach to a particular PHY
++ * device. The phy_device is found, and properly hooked up
++ * to the phy_driver. If no driver is attached, then the
++ * genphy_driver is used. The phy_device is given a ptr to
++ * the attaching device, and given a callback for link status
++ * change. The phy_device is returned to the attaching driver.
++ */
++int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
++ u32 flags, phy_interface_t interface)
++{
++ struct device *d = &phydev->dev;
++
++ /* Assume that if there is no driver, that it doesn't
++ * exist, and we should use the genphy driver. */
++ if (NULL == d->driver) {
++ int err;
++ d->driver = &genphy_driver.driver;
++
++ err = d->driver->probe(d);
++ if (err >= 0)
++ err = device_bind_driver(d);
++
++ if (err)
++ return err;
++ }
++
++ if (phydev->attached_dev) {
++ dev_err(&dev->dev, "PHY already attached\n");
++ return -EBUSY;
++ }
++
++ phydev->attached_dev = dev;
++
++ phydev->dev_flags = flags;
++
++ phydev->interface = interface;
++
++ /* Do initial configuration here, now that
++ * we have certain key parameters
++ * (dev_flags and interface) */
++ return phy_init_hw(phydev);
++}
++EXPORT_SYMBOL(phy_attach_direct);
++
++/**
++ * phy_attach - attach a network device to a particular PHY device
++ * @dev: network device to attach
++ * @bus_id: Bus ID of PHY device to attach
++ * @flags: PHY device's dev_flags
++ * @interface: PHY device's interface
++ *
++ * Description: Same as phy_attach_direct() except that a PHY bus_id
++ * string is passed instead of a pointer to a struct phy_device.
++ */
++struct phy_device *phy_attach(struct net_device *dev,
++ const char *bus_id, u32 flags, phy_interface_t interface)
++{
++ struct bus_type *bus = &mdio_bus_type;
++ struct phy_device *phydev;
++ struct device *d;
++ int rc;
++
++ /* Search the list of PHY devices on the mdio bus for the
++ * PHY with the requested name */
++ d = bus_find_device_by_name(bus, NULL, bus_id);
++ if (!d) {
++ pr_err("PHY %s not found\n", bus_id);
++ return ERR_PTR(-ENODEV);
++ }
++ phydev = to_phy_device(d);
++
++ rc = phy_attach_direct(dev, phydev, flags, interface);
++ if (rc)
++ return ERR_PTR(rc);
++
++ return phydev;
++}
++EXPORT_SYMBOL(phy_attach);
++
++/**
++ * phy_detach - detach a PHY device from its network device
++ * @phydev: target phy_device struct
++ */
++void phy_detach(struct phy_device *phydev)
++{
++ phydev->attached_dev = NULL;
++
++ /* If the device had no specific driver before (i.e. - it
++ * was using the generic driver), we unbind the device
++ * from the generic driver so that there's a chance a
++ * real driver could be loaded */
++ if (phydev->dev.driver == &genphy_driver.driver)
++ device_release_driver(&phydev->dev);
++}
++EXPORT_SYMBOL(phy_detach);
++
++
++/* Generic PHY support and helper functions */
++
++/**
++ * genphy_config_advert - sanitize and advertise auto-negotation parameters
++ * @phydev: target phy_device struct
++ *
++ * Description: Writes MII_ADVERTISE with the appropriate values,
++ * after sanitizing the values to make sure we only advertise
++ * what is supported. Returns < 0 on error, 0 if the PHY's advertisement
++ * hasn't changed, and > 0 if it has changed.
++ */
++int genphy_config_advert(struct phy_device *phydev)
++{
++ u32 advertise;
++ int oldadv, adv;
++ int err, changed = 0;
++
++ /* Only allow advertising what
++ * this PHY supports */
++ phydev->advertising &= phydev->supported;
++ advertise = phydev->advertising;
++
++ /* Setup standard advertisement */
++ oldadv = adv = phy_read(phydev, MII_ADVERTISE);
++
++ if (adv < 0)
++ return adv;
++
++ adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP |
++ ADVERTISE_PAUSE_ASYM);
++ if (advertise & ADVERTISED_10baseT_Half)
++ adv |= ADVERTISE_10HALF;
++ if (advertise & ADVERTISED_10baseT_Full)
++ adv |= ADVERTISE_10FULL;
++ if (advertise & ADVERTISED_100baseT_Half)
++ adv |= ADVERTISE_100HALF;
++ if (advertise & ADVERTISED_100baseT_Full)
++ adv |= ADVERTISE_100FULL;
++ if (advertise & ADVERTISED_Pause)
++ adv |= ADVERTISE_PAUSE_CAP;
++ if (advertise & ADVERTISED_Asym_Pause)
++ adv |= ADVERTISE_PAUSE_ASYM;
++
++ if (adv != oldadv) {
++ err = phy_write(phydev, MII_ADVERTISE, adv);
++
++ if (err < 0)
++ return err;
++ changed = 1;
++ }
++
++ /* Configure gigabit if it's supported */
++ if (phydev->supported & (SUPPORTED_1000baseT_Half |
++ SUPPORTED_1000baseT_Full)) {
++ oldadv = adv = phy_read(phydev, MII_CTRL1000);
++
++ if (adv < 0)
++ return adv;
++
++ adv &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);
++ if (advertise & SUPPORTED_1000baseT_Half)
++ adv |= ADVERTISE_1000HALF;
++ if (advertise & SUPPORTED_1000baseT_Full)
++ adv |= ADVERTISE_1000FULL;
++
++ if (adv != oldadv) {
++ err = phy_write(phydev, MII_CTRL1000, adv);
++
++ if (err < 0)
++ return err;
++ changed = 1;
++ }
++ }
++
++ return changed;
++}
++EXPORT_SYMBOL(genphy_config_advert);
++
++/**
++ * genphy_setup_forced - configures/forces speed/duplex from @phydev
++ * @phydev: target phy_device struct
++ *
++ * Description: Configures MII_BMCR to force speed/duplex
++ * to the values in phydev. Assumes that the values are valid.
++ * Please see phy_sanitize_settings().
++ */
++int genphy_setup_forced(struct phy_device *phydev)
++{
++ int err;
++ int ctl = 0;
++
++ phydev->pause = phydev->asym_pause = 0;
++
++ if (SPEED_1000 == phydev->speed)
++ ctl |= BMCR_SPEED1000;
++ else if (SPEED_100 == phydev->speed)
++ ctl |= BMCR_SPEED100;
++
++ if (DUPLEX_FULL == phydev->duplex)
++ ctl |= BMCR_FULLDPLX;
++
++ err = phy_write(phydev, MII_BMCR, ctl);
++
++ return err;
++}
++
++
++/**
++ * genphy_restart_aneg - Enable and Restart Autonegotiation
++ * @phydev: target phy_device struct
++ */
++int genphy_restart_aneg(struct phy_device *phydev)
++{
++ int ctl;
++
++ ctl = phy_read(phydev, MII_BMCR);
++
++ if (ctl < 0)
++ return ctl;
++
++ ctl |= (BMCR_ANENABLE | BMCR_ANRESTART);
++
++ /* Don't isolate the PHY if we're negotiating */
++ ctl &= ~(BMCR_ISOLATE);
++
++ ctl = phy_write(phydev, MII_BMCR, ctl);
++
++ return ctl;
++}
++EXPORT_SYMBOL(genphy_restart_aneg);
++
++
++/**
++ * genphy_config_aneg - restart auto-negotiation or write BMCR
++ * @phydev: target phy_device struct
++ *
++ * Description: If auto-negotiation is enabled, we configure the
++ * advertising, and then restart auto-negotiation. If it is not
++ * enabled, then we write the BMCR.
++ */
++int genphy_config_aneg(struct phy_device *phydev)
++{
++ int result;
++
++ if (AUTONEG_ENABLE != phydev->autoneg)
++ return genphy_setup_forced(phydev);
++
++ result = genphy_config_advert(phydev);
++
++ if (result < 0) /* error */
++ return result;
++
++ if (result == 0) {
++ /* Advertisment hasn't changed, but maybe aneg was never on to
++ * begin with? Or maybe phy was isolated? */
++ int ctl = phy_read(phydev, MII_BMCR);
++
++ if (ctl < 0)
++ return ctl;
++
++ if (!(ctl & BMCR_ANENABLE) || (ctl & BMCR_ISOLATE))
++ result = 1; /* do restart aneg */
++ }
++
++ /* Only restart aneg if we are advertising something different
++ * than we were before. */
++ if (result > 0)
++ result = genphy_restart_aneg(phydev);
++
++ return result;
++}
++EXPORT_SYMBOL(genphy_config_aneg);
++
++/**
++ * genphy_update_link - update link status in @phydev
++ * @phydev: target phy_device struct
++ *
++ * Description: Update the value in phydev->link to reflect the
++ * current link value. In order to do this, we need to read
++ * the status register twice, keeping the second value.
++ */
++int genphy_update_link(struct phy_device *phydev)
++{
++ int status;
++
++ /* Do a fake read */
++ status = phy_read(phydev, MII_BMSR);
++
++ if (status < 0)
++ return status;
++
++ /* Read link and autonegotiation status */
++ status = phy_read(phydev, MII_BMSR);
++
++ if (status < 0)
++ return status;
++
++ if ((status & BMSR_LSTATUS) == 0)
++ phydev->link = 0;
++ else
++ phydev->link = 1;
++
++ return 0;
++}
++EXPORT_SYMBOL(genphy_update_link);
++
++/**
++ * genphy_read_status - check the link status and update current link state
++ * @phydev: target phy_device struct
++ *
++ * Description: Check the link, then figure out the current state
++ * by comparing what we advertise with what the link partner
++ * advertises. Start by checking the gigabit possibilities,
++ * then move on to 10/100.
++ */
++int genphy_read_status(struct phy_device *phydev)
++{
++ int adv;
++ int err;
++ int lpa;
++ int lpagb = 0;
++
++ /* Update the link, but return if there
++ * was an error */
++ err = genphy_update_link(phydev);
++ if (err)
++ return err;
++
++ if (AUTONEG_ENABLE == phydev->autoneg) {
++ if (phydev->supported & (SUPPORTED_1000baseT_Half
++ | SUPPORTED_1000baseT_Full)) {
++ lpagb = phy_read(phydev, MII_STAT1000);
++
++ if (lpagb < 0)
++ return lpagb;
++
++ adv = phy_read(phydev, MII_CTRL1000);
++
++ if (adv < 0)
++ return adv;
++
++ lpagb &= adv << 2;
++ }
++
++ lpa = phy_read(phydev, MII_LPA);
++
++ if (lpa < 0)
++ return lpa;
++
++ adv = phy_read(phydev, MII_ADVERTISE);
++
++ if (adv < 0)
++ return adv;
++
++ lpa &= adv;
++
++ phydev->speed = SPEED_10;
++ phydev->duplex = DUPLEX_HALF;
++ phydev->pause = phydev->asym_pause = 0;
++
++ if (lpagb & (LPA_1000FULL | LPA_1000HALF)) {
++ phydev->speed = SPEED_1000;
++
++ if (lpagb & LPA_1000FULL)
++ phydev->duplex = DUPLEX_FULL;
++ } else if (lpa & (LPA_100FULL | LPA_100HALF)) {
++ phydev->speed = SPEED_100;
++
++ if (lpa & LPA_100FULL)
++ phydev->duplex = DUPLEX_FULL;
++ } else
++ if (lpa & LPA_10FULL)
++ phydev->duplex = DUPLEX_FULL;
++
++ if (phydev->duplex == DUPLEX_FULL){
++ phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0;
++ phydev->asym_pause = lpa & LPA_PAUSE_ASYM ? 1 : 0;
++ }
++ } else {
++ int bmcr = phy_read(phydev, MII_BMCR);
++ if (bmcr < 0)
++ return bmcr;
++
++ if (bmcr & BMCR_FULLDPLX)
++ phydev->duplex = DUPLEX_FULL;
++ else
++ phydev->duplex = DUPLEX_HALF;
++
++ if (bmcr & BMCR_SPEED1000)
++ phydev->speed = SPEED_1000;
++ else if (bmcr & BMCR_SPEED100)
++ phydev->speed = SPEED_100;
++ else
++ phydev->speed = SPEED_10;
++
++ phydev->pause = phydev->asym_pause = 0;
++ }
++
++ return 0;
++}
++EXPORT_SYMBOL(genphy_read_status);
++
++static int genphy_config_init(struct phy_device *phydev)
++{
++ int val;
++ u32 features;
++
++ /* For now, I'll claim that the generic driver supports
++ * all possible port types */
++ features = (SUPPORTED_TP | SUPPORTED_MII
++ | SUPPORTED_AUI | SUPPORTED_FIBRE |
++ SUPPORTED_BNC);
++
++ /* Do we support autonegotiation? */
++ val = phy_read(phydev, MII_BMSR);
++
++ if (val < 0)
++ return val;
++
++ if (val & BMSR_ANEGCAPABLE)
++ features |= SUPPORTED_Autoneg;
++
++ if (val & BMSR_100FULL)
++ features |= SUPPORTED_100baseT_Full;
++ if (val & BMSR_100HALF)
++ features |= SUPPORTED_100baseT_Half;
++ if (val & BMSR_10FULL)
++ features |= SUPPORTED_10baseT_Full;
++ if (val & BMSR_10HALF)
++ features |= SUPPORTED_10baseT_Half;
++
++ if (val & BMSR_ESTATEN) {
++ val = phy_read(phydev, MII_ESTATUS);
++
++ if (val < 0)
++ return val;
++
++ if (val & ESTATUS_1000_TFULL)
++ features |= SUPPORTED_1000baseT_Full;
++ if (val & ESTATUS_1000_THALF)
++ features |= SUPPORTED_1000baseT_Half;
++ }
++
++ phydev->supported = features;
++ phydev->advertising = features;
++
++ return 0;
++}
++int genphy_suspend(struct phy_device *phydev)
++{
++ int value;
++
++ mutex_lock(&phydev->lock);
++
++ value = phy_read(phydev, MII_BMCR);
++ phy_write(phydev, MII_BMCR, (value | BMCR_PDOWN));
++
++ mutex_unlock(&phydev->lock);
++
++ return 0;
++}
++EXPORT_SYMBOL(genphy_suspend);
++
++int genphy_resume(struct phy_device *phydev)
++{
++ int value;
++
++ mutex_lock(&phydev->lock);
++
++ value = phy_read(phydev, MII_BMCR);
++ phy_write(phydev, MII_BMCR, (value & ~BMCR_PDOWN));
++
++ mutex_unlock(&phydev->lock);
++
++ return 0;
++}
++EXPORT_SYMBOL(genphy_resume);
++
++/**
++ * phy_probe - probe and init a PHY device
++ * @dev: device to probe and init
++ *
++ * Description: Take care of setting up the phy_device structure,
++ * set the state to READY (the driver's init function should
++ * set it to STARTING if needed).
++ */
++static int phy_probe(struct device *dev)
++{
++ struct phy_device *phydev;
++ struct phy_driver *phydrv;
++ struct device_driver *drv;
++ int err = 0;
++
++ phydev = to_phy_device(dev);
++
++ /* Make sure the driver is held.
++ * XXX -- Is this correct? */
++ drv = get_driver(phydev->dev.driver);
++ phydrv = to_phy_driver(drv);
++ phydev->drv = phydrv;
++
++ /* Disable the interrupt if the PHY doesn't support it */
++ if (!(phydrv->flags & PHY_HAS_INTERRUPT))
++ phydev->irq = PHY_POLL;
++
++ mutex_lock(&phydev->lock);
++
++ /* Start out supporting everything. Eventually,
++ * a controller will attach, and may modify one
++ * or both of these values */
++ phydev->supported = phydrv->features;
++ phydev->advertising = phydrv->features;
++
++ /* Set the state to READY by default */
++ phydev->state = PHY_READY;
++
++ if (phydev->drv->probe)
++ err = phydev->drv->probe(phydev);
++
++ mutex_unlock(&phydev->lock);
++
++ return err;
++
++}
++
++static int phy_remove(struct device *dev)
++{
++ struct phy_device *phydev;
++
++ phydev = to_phy_device(dev);
++
++ mutex_lock(&phydev->lock);
++ phydev->state = PHY_DOWN;
++ mutex_unlock(&phydev->lock);
++
++ if (phydev->drv->remove)
++ phydev->drv->remove(phydev);
++
++ put_driver(dev->driver);
++ phydev->drv = NULL;
++
++ return 0;
++}
++
++/**
++ * phy_driver_register - register a phy_driver with the PHY layer
++ * @new_driver: new phy_driver to register
++ */
++int phy_driver_register(struct phy_driver *new_driver)
++{
++ int retval;
++
++ new_driver->driver.name = new_driver->name;
++ new_driver->driver.bus = &mdio_bus_type;
++ new_driver->driver.probe = phy_probe;
++ new_driver->driver.remove = phy_remove;
++
++ retval = driver_register(&new_driver->driver);
++
++ if (retval) {
++ printk(KERN_ERR "%s: Error %d in registering driver\n",
++ new_driver->name, retval);
++
++ return retval;
++ }
++
++ pr_debug("%s: Registered new driver\n", new_driver->name);
++
++ return 0;
++}
++EXPORT_SYMBOL(phy_driver_register);
++
++void phy_driver_unregister(struct phy_driver *drv)
++{
++ driver_unregister(&drv->driver);
++}
++EXPORT_SYMBOL(phy_driver_unregister);
++
++static struct phy_driver genphy_driver = {
++ .phy_id = 0xffffffff,
++ .phy_id_mask = 0xffffffff,
++ .name = "Generic PHY",
++ .config_init = genphy_config_init,
++ .features = 0,
++ .config_aneg = genphy_config_aneg,
++ .read_status = genphy_read_status,
++ .suspend = genphy_suspend,
++ .resume = genphy_resume,
++ .driver = {.owner= THIS_MODULE, },
++};
++
++static int __init phy_init(void)
++{
++ int rc;
++
++ rc = mdio_bus_init();
++ if (rc)
++ return rc;
++
++ rc = phy_driver_register(&genphy_driver);
++ if (rc)
++ mdio_bus_exit();
++
++ return rc;
++}
++
++static void __exit phy_exit(void)
++{
++ phy_driver_unregister(&genphy_driver);
++ mdio_bus_exit();
++}
++
++subsys_initcall(phy_init);
++module_exit(phy_exit);
+diff -Nur linux-2.6.35.7.orig/drivers/spi/ap83_spi.c linux-2.6.35.7/drivers/spi/ap83_spi.c
+--- linux-2.6.35.7.orig/drivers/spi/ap83_spi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/spi/ap83_spi.c 2010-10-14 20:28:01.048101088 +0200
@@ -0,0 +1,282 @@
+/*
+ * Atheros AP83 board specific SPI Controller driver
@@ -15291,9 +23704,9 @@ diff -Nur linux-2.6.34.orig/drivers/spi/ap83_spi.c linux-2.6.34/drivers/spi/ap83
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.34.orig/drivers/spi/ar71xx_spi.c linux-2.6.34/drivers/spi/ar71xx_spi.c
---- linux-2.6.34.orig/drivers/spi/ar71xx_spi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/spi/ar71xx_spi.c 2010-05-25 18:46:12.743464042 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/spi/ar71xx_spi.c linux-2.6.35.7/drivers/spi/ar71xx_spi.c
+--- linux-2.6.35.7.orig/drivers/spi/ar71xx_spi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/spi/ar71xx_spi.c 2010-10-14 20:28:01.088050552 +0200
@@ -0,0 +1,283 @@
+/*
+ * Atheros AR71xx SPI Controller driver
@@ -15578,9 +23991,9 @@ diff -Nur linux-2.6.34.orig/drivers/spi/ar71xx_spi.c linux-2.6.34/drivers/spi/ar
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.34.orig/drivers/spi/Kconfig linux-2.6.34/drivers/spi/Kconfig
---- linux-2.6.34.orig/drivers/spi/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/spi/Kconfig 2010-05-25 18:46:12.800978217 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/spi/Kconfig linux-2.6.35.7/drivers/spi/Kconfig
+--- linux-2.6.35.7.orig/drivers/spi/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/spi/Kconfig 2010-10-14 20:28:01.128101086 +0200
@@ -53,6 +53,13 @@
comment "SPI Master Controller Drivers"
@@ -15595,9 +24008,9 @@ diff -Nur linux-2.6.34.orig/drivers/spi/Kconfig linux-2.6.34/drivers/spi/Kconfig
config SPI_ATMEL
tristate "Atmel SPI Controller"
depends on (ARCH_AT91 || AVR32)
-diff -Nur linux-2.6.34.orig/drivers/spi/Makefile linux-2.6.34/drivers/spi/Makefile
---- linux-2.6.34.orig/drivers/spi/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/spi/Makefile 2010-05-25 18:46:12.843464070 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/spi/Makefile linux-2.6.35.7/drivers/spi/Makefile
+--- linux-2.6.35.7.orig/drivers/spi/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/spi/Makefile 2010-10-14 20:28:01.168101108 +0200
@@ -11,6 +11,7 @@
obj-$(CONFIG_SPI_MASTER) += spi.o
@@ -15606,9 +24019,9 @@ diff -Nur linux-2.6.34.orig/drivers/spi/Makefile linux-2.6.34/drivers/spi/Makefi
obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
-diff -Nur linux-2.6.34.orig/drivers/spi/pb44_spi.c linux-2.6.34/drivers/spi/pb44_spi.c
---- linux-2.6.34.orig/drivers/spi/pb44_spi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/spi/pb44_spi.c 2010-05-25 18:46:12.882113964 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/spi/pb44_spi.c linux-2.6.35.7/drivers/spi/pb44_spi.c
+--- linux-2.6.35.7.orig/drivers/spi/pb44_spi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/spi/pb44_spi.c 2010-10-14 20:28:01.205601089 +0200
@@ -0,0 +1,299 @@
+/*
+ * Atheros PB44 board SPI controller driver
@@ -15909,9 +24322,9 @@ diff -Nur linux-2.6.34.orig/drivers/spi/pb44_spi.c linux-2.6.34/drivers/spi/pb44
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-2.6.34.orig/drivers/spi/spi_vsc7385.c linux-2.6.34/drivers/spi/spi_vsc7385.c
---- linux-2.6.34.orig/drivers/spi/spi_vsc7385.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/spi/spi_vsc7385.c 2010-05-25 18:46:12.923471407 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/spi/spi_vsc7385.c linux-2.6.35.7/drivers/spi/spi_vsc7385.c
+--- linux-2.6.35.7.orig/drivers/spi/spi_vsc7385.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/spi/spi_vsc7385.c 2010-10-14 20:28:01.238101190 +0200
@@ -0,0 +1,620 @@
+/*
+ * SPI driver for the Vitesse VSC7385 ethernet switch
@@ -16533,9 +24946,9 @@ diff -Nur linux-2.6.34.orig/drivers/spi/spi_vsc7385.c linux-2.6.34/drivers/spi/s
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+
-diff -Nur linux-2.6.34.orig/drivers/usb/host/ehci-ar71xx.c linux-2.6.34/drivers/usb/host/ehci-ar71xx.c
---- linux-2.6.34.orig/drivers/usb/host/ehci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/usb/host/ehci-ar71xx.c 2010-05-25 18:46:12.962223093 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ehci-ar71xx.c linux-2.6.35.7/drivers/usb/host/ehci-ar71xx.c
+--- linux-2.6.35.7.orig/drivers/usb/host/ehci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/usb/host/ehci-ar71xx.c 2010-10-14 20:28:01.285601150 +0200
@@ -0,0 +1,242 @@
+/*
+ * Bus Glue for Atheros AR71xx built-in EHCI controller.
@@ -16779,10 +25192,10 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/ehci-ar71xx.c linux-2.6.34/drivers/
+ .name = "ar71xx-ehci",
+ }
+};
-diff -Nur linux-2.6.34.orig/drivers/usb/host/ehci-hcd.c linux-2.6.34/drivers/usb/host/ehci-hcd.c
---- linux-2.6.34.orig/drivers/usb/host/ehci-hcd.c 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/usb/host/ehci-hcd.c 2010-05-25 18:46:13.003464099 +0200
-@@ -1159,6 +1159,11 @@
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ehci-hcd.c linux-2.6.35.7/drivers/usb/host/ehci-hcd.c
+--- linux-2.6.35.7.orig/drivers/usb/host/ehci-hcd.c 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/usb/host/ehci-hcd.c 2010-10-14 20:28:01.328100455 +0200
+@@ -1158,6 +1158,11 @@
#define PLATFORM_DRIVER ehci_atmel_driver
#endif
@@ -16792,11 +25205,1293 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/ehci-hcd.c linux-2.6.34/drivers/usb
+#endif
+
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
- !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
- #error "missing bus glue for ehci-hcd"
-diff -Nur linux-2.6.34.orig/drivers/usb/host/Kconfig linux-2.6.34/drivers/usb/host/Kconfig
---- linux-2.6.34.orig/drivers/usb/host/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/usb/host/Kconfig 2010-05-25 18:46:13.040970869 +0200
+ !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
+ !defined(XILINX_OF_PLATFORM_DRIVER)
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ehci-hcd.c.orig linux-2.6.35.7/drivers/usb/host/ehci-hcd.c.orig
+--- linux-2.6.35.7.orig/drivers/usb/host/ehci-hcd.c.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/usb/host/ehci-hcd.c.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,1278 @@
++/*
++ * Copyright (c) 2000-2004 by David Brownell
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software Foundation,
++ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++#include <linux/module.h>
++#include <linux/pci.h>
++#include <linux/dmapool.h>
++#include <linux/kernel.h>
++#include <linux/delay.h>
++#include <linux/ioport.h>
++#include <linux/sched.h>
++#include <linux/vmalloc.h>
++#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/timer.h>
++#include <linux/ktime.h>
++#include <linux/list.h>
++#include <linux/interrupt.h>
++#include <linux/usb.h>
++#include <linux/usb/hcd.h>
++#include <linux/moduleparam.h>
++#include <linux/dma-mapping.h>
++#include <linux/debugfs.h>
++#include <linux/slab.h>
++
++#include <asm/byteorder.h>
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <asm/system.h>
++#include <asm/unaligned.h>
++
++/*-------------------------------------------------------------------------*/
++
++/*
++ * EHCI hc_driver implementation ... experimental, incomplete.
++ * Based on the final 1.0 register interface specification.
++ *
++ * USB 2.0 shows up in upcoming www.pcmcia.org technology.
++ * First was PCMCIA, like ISA; then CardBus, which is PCI.
++ * Next comes "CardBay", using USB 2.0 signals.
++ *
++ * Contains additional contributions by Brad Hards, Rory Bolt, and others.
++ * Special thanks to Intel and VIA for providing host controllers to
++ * test this driver on, and Cypress (including In-System Design) for
++ * providing early devices for those host controllers to talk to!
++ */
++
++#define DRIVER_AUTHOR "David Brownell"
++#define DRIVER_DESC "USB 2.0 'Enhanced' Host Controller (EHCI) Driver"
++
++static const char hcd_name [] = "ehci_hcd";
++
++
++#undef VERBOSE_DEBUG
++#undef EHCI_URB_TRACE
++
++#ifdef DEBUG
++#define EHCI_STATS
++#endif
++
++/* magic numbers that can affect system performance */
++#define EHCI_TUNE_CERR 3 /* 0-3 qtd retries; 0 == don't stop */
++#define EHCI_TUNE_RL_HS 4 /* nak throttle; see 4.9 */
++#define EHCI_TUNE_RL_TT 0
++#define EHCI_TUNE_MULT_HS 1 /* 1-3 transactions/uframe; 4.10.3 */
++#define EHCI_TUNE_MULT_TT 1
++#define EHCI_TUNE_FLS 2 /* (small) 256 frame schedule */
++
++#define EHCI_IAA_MSECS 10 /* arbitrary */
++#define EHCI_IO_JIFFIES (HZ/10) /* io watchdog > irq_thresh */
++#define EHCI_ASYNC_JIFFIES (HZ/20) /* async idle timeout */
++#define EHCI_SHRINK_FRAMES 5 /* async qh unlink delay */
++
++/* Initial IRQ latency: faster than hw default */
++static int log2_irq_thresh = 0; // 0 to 6
++module_param (log2_irq_thresh, int, S_IRUGO);
++MODULE_PARM_DESC (log2_irq_thresh, "log2 IRQ latency, 1-64 microframes");
++
++/* initial park setting: slower than hw default */
++static unsigned park = 0;
++module_param (park, uint, S_IRUGO);
++MODULE_PARM_DESC (park, "park setting; 1-3 back-to-back async packets");
++
++/* for flakey hardware, ignore overcurrent indicators */
++static int ignore_oc = 0;
++module_param (ignore_oc, bool, S_IRUGO);
++MODULE_PARM_DESC (ignore_oc, "ignore bogus hardware overcurrent indications");
++
++#define INTR_MASK (STS_IAA | STS_FATAL | STS_PCD | STS_ERR | STS_INT)
++
++/*-------------------------------------------------------------------------*/
++
++#include "ehci.h"
++#include "ehci-dbg.c"
++
++/*-------------------------------------------------------------------------*/
++
++static void
++timer_action(struct ehci_hcd *ehci, enum ehci_timer_action action)
++{
++ /* Don't override timeouts which shrink or (later) disable
++ * the async ring; just the I/O watchdog. Note that if a
++ * SHRINK were pending, OFF would never be requested.
++ */
++ if (timer_pending(&ehci->watchdog)
++ && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))
++ & ehci->actions))
++ return;
++
++ if (!test_and_set_bit(action, &ehci->actions)) {
++ unsigned long t;
++
++ switch (action) {
++ case TIMER_IO_WATCHDOG:
++ if (!ehci->need_io_watchdog)
++ return;
++ t = EHCI_IO_JIFFIES;
++ break;
++ case TIMER_ASYNC_OFF:
++ t = EHCI_ASYNC_JIFFIES;
++ break;
++ /* case TIMER_ASYNC_SHRINK: */
++ default:
++ /* add a jiffie since we synch against the
++ * 8 KHz uframe counter.
++ */
++ t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1;
++ break;
++ }
++ mod_timer(&ehci->watchdog, t + jiffies);
++ }
++}
++
++/*-------------------------------------------------------------------------*/
++
++/*
++ * handshake - spin reading hc until handshake completes or fails
++ * @ptr: address of hc register to be read
++ * @mask: bits to look at in result of read
++ * @done: value of those bits when handshake succeeds
++ * @usec: timeout in microseconds
++ *
++ * Returns negative errno, or zero on success
++ *
++ * Success happens when the "mask" bits have the specified value (hardware
++ * handshake done). There are two failure modes: "usec" have passed (major
++ * hardware flakeout), or the register reads as all-ones (hardware removed).
++ *
++ * That last failure should_only happen in cases like physical cardbus eject
++ * before driver shutdown. But it also seems to be caused by bugs in cardbus
++ * bridge shutdown: shutting down the bridge before the devices using it.
++ */
++static int handshake (struct ehci_hcd *ehci, void __iomem *ptr,
++ u32 mask, u32 done, int usec)
++{
++ u32 result;
++
++ do {
++ result = ehci_readl(ehci, ptr);
++ if (result == ~(u32)0) /* card removed */
++ return -ENODEV;
++ result &= mask;
++ if (result == done)
++ return 0;
++ udelay (1);
++ usec--;
++ } while (usec > 0);
++ return -ETIMEDOUT;
++}
++
++/* force HC to halt state from unknown (EHCI spec section 2.3) */
++static int ehci_halt (struct ehci_hcd *ehci)
++{
++ u32 temp = ehci_readl(ehci, &ehci->regs->status);
++
++ /* disable any irqs left enabled by previous code */
++ ehci_writel(ehci, 0, &ehci->regs->intr_enable);
++
++ if ((temp & STS_HALT) != 0)
++ return 0;
++
++ temp = ehci_readl(ehci, &ehci->regs->command);
++ temp &= ~CMD_RUN;
++ ehci_writel(ehci, temp, &ehci->regs->command);
++ return handshake (ehci, &ehci->regs->status,
++ STS_HALT, STS_HALT, 16 * 125);
++}
++
++static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
++ u32 mask, u32 done, int usec)
++{
++ int error;
++
++ error = handshake(ehci, ptr, mask, done, usec);
++ if (error) {
++ ehci_halt(ehci);
++ ehci_to_hcd(ehci)->state = HC_STATE_HALT;
++ ehci_err(ehci, "force halt; handshake %p %08x %08x -> %d\n",
++ ptr, mask, done, error);
++ }
++
++ return error;
++}
++
++/* put TDI/ARC silicon into EHCI mode */
++static void tdi_reset (struct ehci_hcd *ehci)
++{
++ u32 __iomem *reg_ptr;
++ u32 tmp;
++
++ reg_ptr = (u32 __iomem *)(((u8 __iomem *)ehci->regs) + USBMODE);
++ tmp = ehci_readl(ehci, reg_ptr);
++ tmp |= USBMODE_CM_HC;
++ /* The default byte access to MMR space is LE after
++ * controller reset. Set the required endian mode
++ * for transfer buffers to match the host microprocessor
++ */
++ if (ehci_big_endian_mmio(ehci))
++ tmp |= USBMODE_BE;
++ ehci_writel(ehci, tmp, reg_ptr);
++}
++
++/* reset a non-running (STS_HALT == 1) controller */
++static int ehci_reset (struct ehci_hcd *ehci)
++{
++ int retval;
++ u32 command = ehci_readl(ehci, &ehci->regs->command);
++
++ /* If the EHCI debug controller is active, special care must be
++ * taken before and after a host controller reset */
++ if (ehci->debug && !dbgp_reset_prep())
++ ehci->debug = NULL;
++
++ command |= CMD_RESET;
++ dbg_cmd (ehci, "reset", command);
++ ehci_writel(ehci, command, &ehci->regs->command);
++ ehci_to_hcd(ehci)->state = HC_STATE_HALT;
++ ehci->next_statechange = jiffies;
++ retval = handshake (ehci, &ehci->regs->command,
++ CMD_RESET, 0, 250 * 1000);
++
++ if (ehci->has_hostpc) {
++ ehci_writel(ehci, USBMODE_EX_HC | USBMODE_EX_VBPS,
++ (u32 __iomem *)(((u8 *)ehci->regs) + USBMODE_EX));
++ ehci_writel(ehci, TXFIFO_DEFAULT,
++ (u32 __iomem *)(((u8 *)ehci->regs) + TXFILLTUNING));
++ }
++ if (retval)
++ return retval;
++
++ if (ehci_is_TDI(ehci))
++ tdi_reset (ehci);
++
++ if (ehci->debug)
++ dbgp_external_startup();
++
++ return retval;
++}
++
++/* idle the controller (from running) */
++static void ehci_quiesce (struct ehci_hcd *ehci)
++{
++ u32 temp;
++
++#ifdef DEBUG
++ if (!HC_IS_RUNNING (ehci_to_hcd(ehci)->state))
++ BUG ();
++#endif
++
++ /* wait for any schedule enables/disables to take effect */
++ temp = ehci_readl(ehci, &ehci->regs->command) << 10;
++ temp &= STS_ASS | STS_PSS;
++ if (handshake_on_error_set_halt(ehci, &ehci->regs->status,
++ STS_ASS | STS_PSS, temp, 16 * 125))
++ return;
++
++ /* then disable anything that's still active */
++ temp = ehci_readl(ehci, &ehci->regs->command);
++ temp &= ~(CMD_ASE | CMD_IAAD | CMD_PSE);
++ ehci_writel(ehci, temp, &ehci->regs->command);
++
++ /* hardware can take 16 microframes to turn off ... */
++ handshake_on_error_set_halt(ehci, &ehci->regs->status,
++ STS_ASS | STS_PSS, 0, 16 * 125);
++}
++
++/*-------------------------------------------------------------------------*/
++
++static void end_unlink_async(struct ehci_hcd *ehci);
++static void ehci_work(struct ehci_hcd *ehci);
++
++#include "ehci-hub.c"
++#include "ehci-mem.c"
++#include "ehci-q.c"
++#include "ehci-sched.c"
++
++/*-------------------------------------------------------------------------*/
++
++static void ehci_iaa_watchdog(unsigned long param)
++{
++ struct ehci_hcd *ehci = (struct ehci_hcd *) param;
++ unsigned long flags;
++
++ spin_lock_irqsave (&ehci->lock, flags);
++
++ /* Lost IAA irqs wedge things badly; seen first with a vt8235.
++ * So we need this watchdog, but must protect it against both
++ * (a) SMP races against real IAA firing and retriggering, and
++ * (b) clean HC shutdown, when IAA watchdog was pending.
++ */
++ if (ehci->reclaim
++ && !timer_pending(&ehci->iaa_watchdog)
++ && HC_IS_RUNNING(ehci_to_hcd(ehci)->state)) {
++ u32 cmd, status;
++
++ /* If we get here, IAA is *REALLY* late. It's barely
++ * conceivable that the system is so busy that CMD_IAAD
++ * is still legitimately set, so let's be sure it's
++ * clear before we read STS_IAA. (The HC should clear
++ * CMD_IAAD when it sets STS_IAA.)
++ */
++ cmd = ehci_readl(ehci, &ehci->regs->command);
++ if (cmd & CMD_IAAD)
++ ehci_writel(ehci, cmd & ~CMD_IAAD,
++ &ehci->regs->command);
++
++ /* If IAA is set here it either legitimately triggered
++ * before we cleared IAAD above (but _way_ late, so we'll
++ * still count it as lost) ... or a silicon erratum:
++ * - VIA seems to set IAA without triggering the IRQ;
++ * - IAAD potentially cleared without setting IAA.
++ */
++ status = ehci_readl(ehci, &ehci->regs->status);
++ if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
++ COUNT (ehci->stats.lost_iaa);
++ ehci_writel(ehci, STS_IAA, &ehci->regs->status);
++ }
++
++ ehci_vdbg(ehci, "IAA watchdog: status %x cmd %x\n",
++ status, cmd);
++ end_unlink_async(ehci);
++ }
++
++ spin_unlock_irqrestore(&ehci->lock, flags);
++}
++
++static void ehci_watchdog(unsigned long param)
++{
++ struct ehci_hcd *ehci = (struct ehci_hcd *) param;
++ unsigned long flags;
++
++ spin_lock_irqsave(&ehci->lock, flags);
++
++ /* stop async processing after it's idled a bit */
++ if (test_bit (TIMER_ASYNC_OFF, &ehci->actions))
++ start_unlink_async (ehci, ehci->async);
++
++ /* ehci could run by timer, without IRQs ... */
++ ehci_work (ehci);
++
++ spin_unlock_irqrestore (&ehci->lock, flags);
++}
++
++/* On some systems, leaving remote wakeup enabled prevents system shutdown.
++ * The firmware seems to think that powering off is a wakeup event!
++ * This routine turns off remote wakeup and everything else, on all ports.
++ */
++static void ehci_turn_off_all_ports(struct ehci_hcd *ehci)
++{
++ int port = HCS_N_PORTS(ehci->hcs_params);
++
++ while (port--)
++ ehci_writel(ehci, PORT_RWC_BITS,
++ &ehci->regs->port_status[port]);
++}
++
++/*
++ * Halt HC, turn off all ports, and let the BIOS use the companion controllers.
++ * Should be called with ehci->lock held.
++ */
++static void ehci_silence_controller(struct ehci_hcd *ehci)
++{
++ ehci_halt(ehci);
++ ehci_turn_off_all_ports(ehci);
++
++ /* make BIOS/etc use companion controller during reboot */
++ ehci_writel(ehci, 0, &ehci->regs->configured_flag);
++
++ /* unblock posted writes */
++ ehci_readl(ehci, &ehci->regs->configured_flag);
++}
++
++/* ehci_shutdown kick in for silicon on any bus (not just pci, etc).
++ * This forcibly disables dma and IRQs, helping kexec and other cases
++ * where the next system software may expect clean state.
++ */
++static void ehci_shutdown(struct usb_hcd *hcd)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
++
++ del_timer_sync(&ehci->watchdog);
++ del_timer_sync(&ehci->iaa_watchdog);
++
++ spin_lock_irq(&ehci->lock);
++ ehci_silence_controller(ehci);
++ spin_unlock_irq(&ehci->lock);
++}
++
++static void ehci_port_power (struct ehci_hcd *ehci, int is_on)
++{
++ unsigned port;
++
++ if (!HCS_PPC (ehci->hcs_params))
++ return;
++
++ ehci_dbg (ehci, "...power%s ports...\n", is_on ? "up" : "down");
++ for (port = HCS_N_PORTS (ehci->hcs_params); port > 0; )
++ (void) ehci_hub_control(ehci_to_hcd(ehci),
++ is_on ? SetPortFeature : ClearPortFeature,
++ USB_PORT_FEAT_POWER,
++ port--, NULL, 0);
++ /* Flush those writes */
++ ehci_readl(ehci, &ehci->regs->command);
++ msleep(20);
++}
++
++/*-------------------------------------------------------------------------*/
++
++/*
++ * ehci_work is called from some interrupts, timers, and so on.
++ * it calls driver completion functions, after dropping ehci->lock.
++ */
++static void ehci_work (struct ehci_hcd *ehci)
++{
++ timer_action_done (ehci, TIMER_IO_WATCHDOG);
++
++ /* another CPU may drop ehci->lock during a schedule scan while
++ * it reports urb completions. this flag guards against bogus
++ * attempts at re-entrant schedule scanning.
++ */
++ if (ehci->scanning)
++ return;
++ ehci->scanning = 1;
++ scan_async (ehci);
++ if (ehci->next_uframe != -1)
++ scan_periodic (ehci);
++ ehci->scanning = 0;
++
++ /* the IO watchdog guards against hardware or driver bugs that
++ * misplace IRQs, and should let us run completely without IRQs.
++ * such lossage has been observed on both VT6202 and VT8235.
++ */
++ if (HC_IS_RUNNING (ehci_to_hcd(ehci)->state) &&
++ (ehci->async->qh_next.ptr != NULL ||
++ ehci->periodic_sched != 0))
++ timer_action (ehci, TIMER_IO_WATCHDOG);
++}
++
++/*
++ * Called when the ehci_hcd module is removed.
++ */
++static void ehci_stop (struct usb_hcd *hcd)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
++
++ ehci_dbg (ehci, "stop\n");
++
++ /* no more interrupts ... */
++ del_timer_sync (&ehci->watchdog);
++ del_timer_sync(&ehci->iaa_watchdog);
++
++ spin_lock_irq(&ehci->lock);
++ if (HC_IS_RUNNING (hcd->state))
++ ehci_quiesce (ehci);
++
++ ehci_silence_controller(ehci);
++ ehci_reset (ehci);
++ spin_unlock_irq(&ehci->lock);
++
++ remove_companion_file(ehci);
++ remove_debug_files (ehci);
++
++ /* root hub is shut down separately (first, when possible) */
++ spin_lock_irq (&ehci->lock);
++ if (ehci->async)
++ ehci_work (ehci);
++ spin_unlock_irq (&ehci->lock);
++ ehci_mem_cleanup (ehci);
++
++#ifdef EHCI_STATS
++ ehci_dbg (ehci, "irq normal %ld err %ld reclaim %ld (lost %ld)\n",
++ ehci->stats.normal, ehci->stats.error, ehci->stats.reclaim,
++ ehci->stats.lost_iaa);
++ ehci_dbg (ehci, "complete %ld unlink %ld\n",
++ ehci->stats.complete, ehci->stats.unlink);
++#endif
++
++ dbg_status (ehci, "ehci_stop completed",
++ ehci_readl(ehci, &ehci->regs->status));
++}
++
++/* one-time init, only for memory state */
++static int ehci_init(struct usb_hcd *hcd)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
++ u32 temp;
++ int retval;
++ u32 hcc_params;
++ struct ehci_qh_hw *hw;
++
++ spin_lock_init(&ehci->lock);
++
++ /*
++ * keep io watchdog by default, those good HCDs could turn off it later
++ */
++ ehci->need_io_watchdog = 1;
++ init_timer(&ehci->watchdog);
++ ehci->watchdog.function = ehci_watchdog;
++ ehci->watchdog.data = (unsigned long) ehci;
++
++ init_timer(&ehci->iaa_watchdog);
++ ehci->iaa_watchdog.function = ehci_iaa_watchdog;
++ ehci->iaa_watchdog.data = (unsigned long) ehci;
++
++ /*
++ * hw default: 1K periodic list heads, one per frame.
++ * periodic_size can shrink by USBCMD update if hcc_params allows.
++ */
++ ehci->periodic_size = DEFAULT_I_TDPS;
++ INIT_LIST_HEAD(&ehci->cached_itd_list);
++ INIT_LIST_HEAD(&ehci->cached_sitd_list);
++ if ((retval = ehci_mem_init(ehci, GFP_KERNEL)) < 0)
++ return retval;
++
++ /* controllers may cache some of the periodic schedule ... */
++ hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
++ if (HCC_ISOC_CACHE(hcc_params)) // full frame cache
++ ehci->i_thresh = 2 + 8;
++ else // N microframes cached
++ ehci->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
++
++ ehci->reclaim = NULL;
++ ehci->next_uframe = -1;
++ ehci->clock_frame = -1;
++
++ /*
++ * dedicate a qh for the async ring head, since we couldn't unlink
++ * a 'real' qh without stopping the async schedule [4.8]. use it
++ * as the 'reclamation list head' too.
++ * its dummy is used in hw_alt_next of many tds, to prevent the qh
++ * from automatically advancing to the next td after short reads.
++ */
++ ehci->async->qh_next.qh = NULL;
++ hw = ehci->async->hw;
++ hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma);
++ hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD);
++ hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);
++ hw->hw_qtd_next = EHCI_LIST_END(ehci);
++ ehci->async->qh_state = QH_STATE_LINKED;
++ hw->hw_alt_next = QTD_NEXT(ehci, ehci->async->dummy->qtd_dma);
++
++ /* clear interrupt enables, set irq latency */
++ if (log2_irq_thresh < 0 || log2_irq_thresh > 6)
++ log2_irq_thresh = 0;
++ temp = 1 << (16 + log2_irq_thresh);
++ if (HCC_CANPARK(hcc_params)) {
++ /* HW default park == 3, on hardware that supports it (like
++ * NVidia and ALI silicon), maximizes throughput on the async
++ * schedule by avoiding QH fetches between transfers.
++ *
++ * With fast usb storage devices and NForce2, "park" seems to
++ * make problems: throughput reduction (!), data errors...
++ */
++ if (park) {
++ park = min(park, (unsigned) 3);
++ temp |= CMD_PARK;
++ temp |= park << 8;
++ }
++ ehci_dbg(ehci, "park %d\n", park);
++ }
++ if (HCC_PGM_FRAMELISTLEN(hcc_params)) {
++ /* periodic schedule size can be smaller than default */
++ temp &= ~(3 << 2);
++ temp |= (EHCI_TUNE_FLS << 2);
++ switch (EHCI_TUNE_FLS) {
++ case 0: ehci->periodic_size = 1024; break;
++ case 1: ehci->periodic_size = 512; break;
++ case 2: ehci->periodic_size = 256; break;
++ default: BUG();
++ }
++ }
++ ehci->command = temp;
++
++ /* Accept arbitrarily long scatter-gather lists */
++ hcd->self.sg_tablesize = ~0;
++ return 0;
++}
++
++/* start HC running; it's halted, ehci_init() has been run (once) */
++static int ehci_run (struct usb_hcd *hcd)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
++ int retval;
++ u32 temp;
++ u32 hcc_params;
++
++ hcd->uses_new_polling = 1;
++ hcd->poll_rh = 0;
++
++ /* EHCI spec section 4.1 */
++ if ((retval = ehci_reset(ehci)) != 0) {
++ ehci_mem_cleanup(ehci);
++ return retval;
++ }
++ ehci_writel(ehci, ehci->periodic_dma, &ehci->regs->frame_list);
++ ehci_writel(ehci, (u32)ehci->async->qh_dma, &ehci->regs->async_next);
++
++ /*
++ * hcc_params controls whether ehci->regs->segment must (!!!)
++ * be used; it constrains QH/ITD/SITD and QTD locations.
++ * pci_pool consistent memory always uses segment zero.
++ * streaming mappings for I/O buffers, like pci_map_single(),
++ * can return segments above 4GB, if the device allows.
++ *
++ * NOTE: the dma mask is visible through dma_supported(), so
++ * drivers can pass this info along ... like NETIF_F_HIGHDMA,
++ * Scsi_Host.highmem_io, and so forth. It's readonly to all
++ * host side drivers though.
++ */
++ hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
++ if (HCC_64BIT_ADDR(hcc_params)) {
++ ehci_writel(ehci, 0, &ehci->regs->segment);
++#if 0
++// this is deeply broken on almost all architectures
++ if (!dma_set_mask(hcd->self.controller, DMA_BIT_MASK(64)))
++ ehci_info(ehci, "enabled 64bit DMA\n");
++#endif
++ }
++
++
++ // Philips, Intel, and maybe others need CMD_RUN before the
++ // root hub will detect new devices (why?); NEC doesn't
++ ehci->command &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
++ ehci->command |= CMD_RUN;
++ ehci_writel(ehci, ehci->command, &ehci->regs->command);
++ dbg_cmd (ehci, "init", ehci->command);
++
++ /*
++ * Start, enabling full USB 2.0 functionality ... usb 1.1 devices
++ * are explicitly handed to companion controller(s), so no TT is
++ * involved with the root hub. (Except where one is integrated,
++ * and there's no companion controller unless maybe for USB OTG.)
++ *
++ * Turning on the CF flag will transfer ownership of all ports
++ * from the companions to the EHCI controller. If any of the
++ * companions are in the middle of a port reset at the time, it
++ * could cause trouble. Write-locking ehci_cf_port_reset_rwsem
++ * guarantees that no resets are in progress. After we set CF,
++ * a short delay lets the hardware catch up; new resets shouldn't
++ * be started before the port switching actions could complete.
++ */
++ down_write(&ehci_cf_port_reset_rwsem);
++ hcd->state = HC_STATE_RUNNING;
++ ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag);
++ ehci_readl(ehci, &ehci->regs->command); /* unblock posted writes */
++ msleep(5);
++ up_write(&ehci_cf_port_reset_rwsem);
++ ehci->last_periodic_enable = ktime_get_real();
++
++ temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase));
++ ehci_info (ehci,
++ "USB %x.%x started, EHCI %x.%02x%s\n",
++ ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
++ temp >> 8, temp & 0xff,
++ ignore_oc ? ", overcurrent ignored" : "");
++
++ ehci_writel(ehci, INTR_MASK,
++ &ehci->regs->intr_enable); /* Turn On Interrupts */
++
++ /* GRR this is run-once init(), being done every time the HC starts.
++ * So long as they're part of class devices, we can't do it init()
++ * since the class device isn't created that early.
++ */
++ create_debug_files(ehci);
++ create_companion_file(ehci);
++
++ return 0;
++}
++
++/*-------------------------------------------------------------------------*/
++
++static irqreturn_t ehci_irq (struct usb_hcd *hcd)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
++ u32 status, masked_status, pcd_status = 0, cmd;
++ int bh;
++
++ spin_lock (&ehci->lock);
++
++ status = ehci_readl(ehci, &ehci->regs->status);
++
++ /* e.g. cardbus physical eject */
++ if (status == ~(u32) 0) {
++ ehci_dbg (ehci, "device removed\n");
++ goto dead;
++ }
++
++ masked_status = status & INTR_MASK;
++ if (!masked_status) { /* irq sharing? */
++ spin_unlock(&ehci->lock);
++ return IRQ_NONE;
++ }
++
++ /* clear (just) interrupts */
++ ehci_writel(ehci, masked_status, &ehci->regs->status);
++ cmd = ehci_readl(ehci, &ehci->regs->command);
++ bh = 0;
++
++#ifdef VERBOSE_DEBUG
++ /* unrequested/ignored: Frame List Rollover */
++ dbg_status (ehci, "irq", status);
++#endif
++
++ /* INT, ERR, and IAA interrupt rates can be throttled */
++
++ /* normal [4.15.1.2] or error [4.15.1.1] completion */
++ if (likely ((status & (STS_INT|STS_ERR)) != 0)) {
++ if (likely ((status & STS_ERR) == 0))
++ COUNT (ehci->stats.normal);
++ else
++ COUNT (ehci->stats.error);
++ bh = 1;
++ }
++
++ /* complete the unlinking of some qh [4.15.2.3] */
++ if (status & STS_IAA) {
++ /* guard against (alleged) silicon errata */
++ if (cmd & CMD_IAAD) {
++ ehci_writel(ehci, cmd & ~CMD_IAAD,
++ &ehci->regs->command);
++ ehci_dbg(ehci, "IAA with IAAD still set?\n");
++ }
++ if (ehci->reclaim) {
++ COUNT(ehci->stats.reclaim);
++ end_unlink_async(ehci);
++ } else
++ ehci_dbg(ehci, "IAA with nothing to reclaim?\n");
++ }
++
++ /* remote wakeup [4.3.1] */
++ if (status & STS_PCD) {
++ unsigned i = HCS_N_PORTS (ehci->hcs_params);
++
++ /* kick root hub later */
++ pcd_status = status;
++
++ /* resume root hub? */
++ if (!(cmd & CMD_RUN))
++ usb_hcd_resume_root_hub(hcd);
++
++ while (i--) {
++ int pstatus = ehci_readl(ehci,
++ &ehci->regs->port_status [i]);
++
++ if (pstatus & PORT_OWNER)
++ continue;
++ if (!(test_bit(i, &ehci->suspended_ports) &&
++ ((pstatus & PORT_RESUME) ||
++ !(pstatus & PORT_SUSPEND)) &&
++ (pstatus & PORT_PE) &&
++ ehci->reset_done[i] == 0))
++ continue;
++
++ /* start 20 msec resume signaling from this port,
++ * and make khubd collect PORT_STAT_C_SUSPEND to
++ * stop that signaling. Use 5 ms extra for safety,
++ * like usb_port_resume() does.
++ */
++ ehci->reset_done[i] = jiffies + msecs_to_jiffies(25);
++ ehci_dbg (ehci, "port %d remote wakeup\n", i + 1);
++ mod_timer(&hcd->rh_timer, ehci->reset_done[i]);
++ }
++ }
++
++ /* PCI errors [4.15.2.4] */
++ if (unlikely ((status & STS_FATAL) != 0)) {
++ ehci_err(ehci, "fatal error\n");
++ dbg_cmd(ehci, "fatal", cmd);
++ dbg_status(ehci, "fatal", status);
++ ehci_halt(ehci);
++dead:
++ ehci_reset(ehci);
++ ehci_writel(ehci, 0, &ehci->regs->configured_flag);
++ /* generic layer kills/unlinks all urbs, then
++ * uses ehci_stop to clean up the rest
++ */
++ bh = 1;
++ }
++
++ if (bh)
++ ehci_work (ehci);
++ spin_unlock (&ehci->lock);
++ if (pcd_status)
++ usb_hcd_poll_rh_status(hcd);
++ return IRQ_HANDLED;
++}
++
++/*-------------------------------------------------------------------------*/
++
++/*
++ * non-error returns are a promise to giveback() the urb later
++ * we drop ownership so next owner (or urb unlink) can get it
++ *
++ * urb + dev is in hcd.self.controller.urb_list
++ * we're queueing TDs onto software and hardware lists
++ *
++ * hcd-specific init for hcpriv hasn't been done yet
++ *
++ * NOTE: control, bulk, and interrupt share the same code to append TDs
++ * to a (possibly active) QH, and the same QH scanning code.
++ */
++static int ehci_urb_enqueue (
++ struct usb_hcd *hcd,
++ struct urb *urb,
++ gfp_t mem_flags
++) {
++ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
++ struct list_head qtd_list;
++
++ INIT_LIST_HEAD (&qtd_list);
++
++ switch (usb_pipetype (urb->pipe)) {
++ case PIPE_CONTROL:
++ /* qh_completions() code doesn't handle all the fault cases
++ * in multi-TD control transfers. Even 1KB is rare anyway.
++ */
++ if (urb->transfer_buffer_length > (16 * 1024))
++ return -EMSGSIZE;
++ /* FALLTHROUGH */
++ /* case PIPE_BULK: */
++ default:
++ if (!qh_urb_transaction (ehci, urb, &qtd_list, mem_flags))
++ return -ENOMEM;
++ return submit_async(ehci, urb, &qtd_list, mem_flags);
++
++ case PIPE_INTERRUPT:
++ if (!qh_urb_transaction (ehci, urb, &qtd_list, mem_flags))
++ return -ENOMEM;
++ return intr_submit(ehci, urb, &qtd_list, mem_flags);
++
++ case PIPE_ISOCHRONOUS:
++ if (urb->dev->speed == USB_SPEED_HIGH)
++ return itd_submit (ehci, urb, mem_flags);
++ else
++ return sitd_submit (ehci, urb, mem_flags);
++ }
++}
++
++static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
++{
++ /* failfast */
++ if (!HC_IS_RUNNING(ehci_to_hcd(ehci)->state) && ehci->reclaim)
++ end_unlink_async(ehci);
++
++ /* If the QH isn't linked then there's nothing we can do
++ * unless we were called during a giveback, in which case
++ * qh_completions() has to deal with it.
++ */
++ if (qh->qh_state != QH_STATE_LINKED) {
++ if (qh->qh_state == QH_STATE_COMPLETING)
++ qh->needs_rescan = 1;
++ return;
++ }
++
++ /* defer till later if busy */
++ if (ehci->reclaim) {
++ struct ehci_qh *last;
++
++ for (last = ehci->reclaim;
++ last->reclaim;
++ last = last->reclaim)
++ continue;
++ qh->qh_state = QH_STATE_UNLINK_WAIT;
++ last->reclaim = qh;
++
++ /* start IAA cycle */
++ } else
++ start_unlink_async (ehci, qh);
++}
++
++/* remove from hardware lists
++ * completions normally happen asynchronously
++ */
++
++static int ehci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
++ struct ehci_qh *qh;
++ unsigned long flags;
++ int rc;
++
++ spin_lock_irqsave (&ehci->lock, flags);
++ rc = usb_hcd_check_unlink_urb(hcd, urb, status);
++ if (rc)
++ goto done;
++
++ switch (usb_pipetype (urb->pipe)) {
++ // case PIPE_CONTROL:
++ // case PIPE_BULK:
++ default:
++ qh = (struct ehci_qh *) urb->hcpriv;
++ if (!qh)
++ break;
++ switch (qh->qh_state) {
++ case QH_STATE_LINKED:
++ case QH_STATE_COMPLETING:
++ unlink_async(ehci, qh);
++ break;
++ case QH_STATE_UNLINK:
++ case QH_STATE_UNLINK_WAIT:
++ /* already started */
++ break;
++ case QH_STATE_IDLE:
++ /* QH might be waiting for a Clear-TT-Buffer */
++ qh_completions(ehci, qh);
++ break;
++ }
++ break;
++
++ case PIPE_INTERRUPT:
++ qh = (struct ehci_qh *) urb->hcpriv;
++ if (!qh)
++ break;
++ switch (qh->qh_state) {
++ case QH_STATE_LINKED:
++ case QH_STATE_COMPLETING:
++ intr_deschedule (ehci, qh);
++ break;
++ case QH_STATE_IDLE:
++ qh_completions (ehci, qh);
++ break;
++ default:
++ ehci_dbg (ehci, "bogus qh %p state %d\n",
++ qh, qh->qh_state);
++ goto done;
++ }
++ break;
++
++ case PIPE_ISOCHRONOUS:
++ // itd or sitd ...
++
++ // wait till next completion, do it then.
++ // completion irqs can wait up to 1024 msec,
++ break;
++ }
++done:
++ spin_unlock_irqrestore (&ehci->lock, flags);
++ return rc;
++}
++
++/*-------------------------------------------------------------------------*/
++
++// bulk qh holds the data toggle
++
++static void
++ehci_endpoint_disable (struct usb_hcd *hcd, struct usb_host_endpoint *ep)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
++ unsigned long flags;
++ struct ehci_qh *qh, *tmp;
++
++ /* ASSERT: any requests/urbs are being unlinked */
++ /* ASSERT: nobody can be submitting urbs for this any more */
++
++rescan:
++ spin_lock_irqsave (&ehci->lock, flags);
++ qh = ep->hcpriv;
++ if (!qh)
++ goto done;
++
++ /* endpoints can be iso streams. for now, we don't
++ * accelerate iso completions ... so spin a while.
++ */
++ if (qh->hw == NULL) {
++ ehci_vdbg (ehci, "iso delay\n");
++ goto idle_timeout;
++ }
++
++ if (!HC_IS_RUNNING (hcd->state))
++ qh->qh_state = QH_STATE_IDLE;
++ switch (qh->qh_state) {
++ case QH_STATE_LINKED:
++ case QH_STATE_COMPLETING:
++ for (tmp = ehci->async->qh_next.qh;
++ tmp && tmp != qh;
++ tmp = tmp->qh_next.qh)
++ continue;
++ /* periodic qh self-unlinks on empty */
++ if (!tmp)
++ goto nogood;
++ unlink_async (ehci, qh);
++ /* FALL THROUGH */
++ case QH_STATE_UNLINK: /* wait for hw to finish? */
++ case QH_STATE_UNLINK_WAIT:
++idle_timeout:
++ spin_unlock_irqrestore (&ehci->lock, flags);
++ schedule_timeout_uninterruptible(1);
++ goto rescan;
++ case QH_STATE_IDLE: /* fully unlinked */
++ if (qh->clearing_tt)
++ goto idle_timeout;
++ if (list_empty (&qh->qtd_list)) {
++ qh_put (qh);
++ break;
++ }
++ /* else FALL THROUGH */
++ default:
++nogood:
++ /* caller was supposed to have unlinked any requests;
++ * that's not our job. just leak this memory.
++ */
++ ehci_err (ehci, "qh %p (#%02x) state %d%s\n",
++ qh, ep->desc.bEndpointAddress, qh->qh_state,
++ list_empty (&qh->qtd_list) ? "" : "(has tds)");
++ break;
++ }
++ ep->hcpriv = NULL;
++done:
++ spin_unlock_irqrestore (&ehci->lock, flags);
++ return;
++}
++
++static void
++ehci_endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
++ struct ehci_qh *qh;
++ int eptype = usb_endpoint_type(&ep->desc);
++ int epnum = usb_endpoint_num(&ep->desc);
++ int is_out = usb_endpoint_dir_out(&ep->desc);
++ unsigned long flags;
++
++ if (eptype != USB_ENDPOINT_XFER_BULK && eptype != USB_ENDPOINT_XFER_INT)
++ return;
++
++ spin_lock_irqsave(&ehci->lock, flags);
++ qh = ep->hcpriv;
++
++ /* For Bulk and Interrupt endpoints we maintain the toggle state
++ * in the hardware; the toggle bits in udev aren't used at all.
++ * When an endpoint is reset by usb_clear_halt() we must reset
++ * the toggle bit in the QH.
++ */
++ if (qh) {
++ usb_settoggle(qh->dev, epnum, is_out, 0);
++ if (!list_empty(&qh->qtd_list)) {
++ WARN_ONCE(1, "clear_halt for a busy endpoint\n");
++ } else if (qh->qh_state == QH_STATE_LINKED ||
++ qh->qh_state == QH_STATE_COMPLETING) {
++
++ /* The toggle value in the QH can't be updated
++ * while the QH is active. Unlink it now;
++ * re-linking will call qh_refresh().
++ */
++ if (eptype == USB_ENDPOINT_XFER_BULK)
++ unlink_async(ehci, qh);
++ else
++ intr_deschedule(ehci, qh);
++ }
++ }
++ spin_unlock_irqrestore(&ehci->lock, flags);
++}
++
++static int ehci_get_frame (struct usb_hcd *hcd)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci (hcd);
++ return (ehci_readl(ehci, &ehci->regs->frame_index) >> 3) %
++ ehci->periodic_size;
++}
++
++/*-------------------------------------------------------------------------*/
++
++MODULE_DESCRIPTION(DRIVER_DESC);
++MODULE_AUTHOR (DRIVER_AUTHOR);
++MODULE_LICENSE ("GPL");
++
++#ifdef CONFIG_PCI
++#include "ehci-pci.c"
++#define PCI_DRIVER ehci_pci_driver
++#endif
++
++#ifdef CONFIG_USB_EHCI_FSL
++#include "ehci-fsl.c"
++#define PLATFORM_DRIVER ehci_fsl_driver
++#endif
++
++#ifdef CONFIG_USB_EHCI_MXC
++#include "ehci-mxc.c"
++#define PLATFORM_DRIVER ehci_mxc_driver
++#endif
++
++#ifdef CONFIG_SOC_AU1200
++#include "ehci-au1xxx.c"
++#define PLATFORM_DRIVER ehci_hcd_au1xxx_driver
++#endif
++
++#ifdef CONFIG_ARCH_OMAP3
++#include "ehci-omap.c"
++#define PLATFORM_DRIVER ehci_hcd_omap_driver
++#endif
++
++#ifdef CONFIG_PPC_PS3
++#include "ehci-ps3.c"
++#define PS3_SYSTEM_BUS_DRIVER ps3_ehci_driver
++#endif
++
++#ifdef CONFIG_USB_EHCI_HCD_PPC_OF
++#include "ehci-ppc-of.c"
++#define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver
++#endif
++
++#ifdef CONFIG_XPS_USB_HCD_XILINX
++#include "ehci-xilinx-of.c"
++#define XILINX_OF_PLATFORM_DRIVER ehci_hcd_xilinx_of_driver
++#endif
++
++#ifdef CONFIG_PLAT_ORION
++#include "ehci-orion.c"
++#define PLATFORM_DRIVER ehci_orion_driver
++#endif
++
++#ifdef CONFIG_ARCH_IXP4XX
++#include "ehci-ixp4xx.c"
++#define PLATFORM_DRIVER ixp4xx_ehci_driver
++#endif
++
++#ifdef CONFIG_USB_W90X900_EHCI
++#include "ehci-w90x900.c"
++#define PLATFORM_DRIVER ehci_hcd_w90x900_driver
++#endif
++
++#ifdef CONFIG_ARCH_AT91
++#include "ehci-atmel.c"
++#define PLATFORM_DRIVER ehci_atmel_driver
++#endif
++
++#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
++ !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
++ !defined(XILINX_OF_PLATFORM_DRIVER)
++#error "missing bus glue for ehci-hcd"
++#endif
++
++static int __init ehci_hcd_init(void)
++{
++ int retval = 0;
++
++ if (usb_disabled())
++ return -ENODEV;
++
++ printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name);
++ set_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
++ if (test_bit(USB_UHCI_LOADED, &usb_hcds_loaded) ||
++ test_bit(USB_OHCI_LOADED, &usb_hcds_loaded))
++ printk(KERN_WARNING "Warning! ehci_hcd should always be loaded"
++ " before uhci_hcd and ohci_hcd, not after\n");
++
++ pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",
++ hcd_name,
++ sizeof(struct ehci_qh), sizeof(struct ehci_qtd),
++ sizeof(struct ehci_itd), sizeof(struct ehci_sitd));
++
++#ifdef DEBUG
++ ehci_debug_root = debugfs_create_dir("ehci", usb_debug_root);
++ if (!ehci_debug_root) {
++ retval = -ENOENT;
++ goto err_debug;
++ }
++#endif
++
++#ifdef PLATFORM_DRIVER
++ retval = platform_driver_register(&PLATFORM_DRIVER);
++ if (retval < 0)
++ goto clean0;
++#endif
++
++#ifdef PCI_DRIVER
++ retval = pci_register_driver(&PCI_DRIVER);
++ if (retval < 0)
++ goto clean1;
++#endif
++
++#ifdef PS3_SYSTEM_BUS_DRIVER
++ retval = ps3_ehci_driver_register(&PS3_SYSTEM_BUS_DRIVER);
++ if (retval < 0)
++ goto clean2;
++#endif
++
++#ifdef OF_PLATFORM_DRIVER
++ retval = of_register_platform_driver(&OF_PLATFORM_DRIVER);
++ if (retval < 0)
++ goto clean3;
++#endif
++
++#ifdef XILINX_OF_PLATFORM_DRIVER
++ retval = of_register_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
++ if (retval < 0)
++ goto clean4;
++#endif
++ return retval;
++
++#ifdef XILINX_OF_PLATFORM_DRIVER
++ /* of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER); */
++clean4:
++#endif
++#ifdef OF_PLATFORM_DRIVER
++ of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
++clean3:
++#endif
++#ifdef PS3_SYSTEM_BUS_DRIVER
++ ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
++clean2:
++#endif
++#ifdef PCI_DRIVER
++ pci_unregister_driver(&PCI_DRIVER);
++clean1:
++#endif
++#ifdef PLATFORM_DRIVER
++ platform_driver_unregister(&PLATFORM_DRIVER);
++clean0:
++#endif
++#ifdef DEBUG
++ debugfs_remove(ehci_debug_root);
++ ehci_debug_root = NULL;
++err_debug:
++#endif
++ clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
++ return retval;
++}
++module_init(ehci_hcd_init);
++
++static void __exit ehci_hcd_cleanup(void)
++{
++#ifdef XILINX_OF_PLATFORM_DRIVER
++ of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
++#endif
++#ifdef OF_PLATFORM_DRIVER
++ of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
++#endif
++#ifdef PLATFORM_DRIVER
++ platform_driver_unregister(&PLATFORM_DRIVER);
++#endif
++#ifdef PCI_DRIVER
++ pci_unregister_driver(&PCI_DRIVER);
++#endif
++#ifdef PS3_SYSTEM_BUS_DRIVER
++ ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
++#endif
++#ifdef DEBUG
++ debugfs_remove(ehci_debug_root);
++#endif
++ clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
++}
++module_exit(ehci_hcd_cleanup);
++
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/Kconfig linux-2.6.35.7/drivers/usb/host/Kconfig
+--- linux-2.6.35.7.orig/drivers/usb/host/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/usb/host/Kconfig 2010-10-14 20:28:01.385601136 +0200
@@ -109,6 +109,13 @@
support both high speed and full speed devices, or high speed
devices only.
@@ -16811,9 +26506,9 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/Kconfig linux-2.6.34/drivers/usb/ho
config USB_EHCI_FSL
bool "Support for Freescale on-chip EHCI USB controller"
depends on USB_EHCI_HCD && FSL_SOC
-@@ -207,6 +214,13 @@
- To compile this driver as a module, choose M here: the
- module will be called ohci-hcd.
+@@ -222,6 +229,13 @@
+ Enables support for the on-chip OHCI controller on
+ OMAP3 and later chips.
+config USB_OHCI_AR71XX
+ bool "USB OHCI support for Atheros AR71xx"
@@ -16825,9 +26520,440 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/Kconfig linux-2.6.34/drivers/usb/ho
config USB_OHCI_HCD_PPC_SOC
bool "OHCI support for on-chip PPC USB controller"
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
-diff -Nur linux-2.6.34.orig/drivers/usb/host/ohci-ar71xx.c linux-2.6.34/drivers/usb/host/ohci-ar71xx.c
---- linux-2.6.34.orig/drivers/usb/host/ohci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/usb/host/ohci-ar71xx.c 2010-05-25 18:46:13.093473080 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/Kconfig.orig linux-2.6.35.7/drivers/usb/host/Kconfig.orig
+--- linux-2.6.35.7.orig/drivers/usb/host/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/usb/host/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,427 @@
++#
++# USB Host Controller Drivers
++#
++comment "USB Host Controller Drivers"
++ depends on USB
++
++config USB_C67X00_HCD
++ tristate "Cypress C67x00 HCD support"
++ depends on USB
++ help
++ The Cypress C67x00 (EZ-Host/EZ-OTG) chips are dual-role
++ host/peripheral/OTG USB controllers.
++
++ Enable this option to support this chip in host controller mode.
++ If unsure, say N.
++
++ To compile this driver as a module, choose M here: the
++ module will be called c67x00.
++
++config USB_XHCI_HCD
++ tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)"
++ depends on USB && PCI && EXPERIMENTAL
++ ---help---
++ The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
++ "SuperSpeed" host controller hardware.
++
++ To compile this driver as a module, choose M here: the
++ module will be called xhci-hcd.
++
++config USB_XHCI_HCD_DEBUGGING
++ bool "Debugging for the xHCI host controller"
++ depends on USB_XHCI_HCD
++ ---help---
++ Say 'Y' to turn on debugging for the xHCI host controller driver.
++ This will spew debugging output, even in interrupt context.
++ This should only be used for debugging xHCI driver bugs.
++
++ If unsure, say N.
++
++config USB_EHCI_HCD
++ tristate "EHCI HCD (USB 2.0) support"
++ depends on USB && USB_ARCH_HAS_EHCI
++ ---help---
++ The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
++ "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
++ If your USB host controller supports USB 2.0, you will likely want to
++ configure this Host Controller Driver.
++
++ EHCI controllers are packaged with "companion" host controllers (OHCI
++ or UHCI) to handle USB 1.1 devices connected to root hub ports. Ports
++ will connect to EHCI if the device is high speed, otherwise they
++ connect to a companion controller. If you configure EHCI, you should
++ probably configure the OHCI (for NEC and some other vendors) USB Host
++ Controller Driver or UHCI (for Via motherboards) Host Controller
++ Driver too.
++
++ You may want to read <file:Documentation/usb/ehci.txt>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ehci-hcd.
++
++config USB_EHCI_ROOT_HUB_TT
++ bool "Root Hub Transaction Translators"
++ depends on USB_EHCI_HCD
++ ---help---
++ Some EHCI chips have vendor-specific extensions to integrate
++ transaction translators, so that no OHCI or UHCI companion
++ controller is needed. It's safe to say "y" even if your
++ controller doesn't support this feature.
++
++ This supports the EHCI implementation that's originally
++ from ARC, and has since changed hands a few times.
++
++config USB_EHCI_TT_NEWSCHED
++ bool "Improved Transaction Translator scheduling (EXPERIMENTAL)"
++ depends on USB_EHCI_HCD && EXPERIMENTAL
++ ---help---
++ This changes the periodic scheduling code to fill more of the low
++ and full speed bandwidth available from the Transaction Translator
++ (TT) in USB 2.0 hubs. Without this, only one transfer will be
++ issued in each microframe, significantly reducing the number of
++ periodic low/fullspeed transfers possible.
++
++ If you have multiple periodic low/fullspeed devices connected to a
++ highspeed USB hub which is connected to a highspeed USB Host
++ Controller, and some of those devices will not work correctly
++ (possibly due to "ENOSPC" or "-28" errors), say Y.
++
++ If unsure, say N.
++
++config USB_EHCI_BIG_ENDIAN_MMIO
++ bool
++ depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX)
++ default y
++
++config USB_EHCI_BIG_ENDIAN_DESC
++ bool
++ depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX)
++ default y
++
++config XPS_USB_HCD_XILINX
++ bool "Use Xilinx usb host EHCI controller core"
++ depends on USB_EHCI_HCD && (PPC32 || MICROBLAZE)
++ select USB_EHCI_BIG_ENDIAN_DESC
++ select USB_EHCI_BIG_ENDIAN_MMIO
++ ---help---
++ Xilinx xps USB host controller core is EHCI compilant and has
++ transaction translator built-in. It can be configured to either
++ support both high speed and full speed devices, or high speed
++ devices only.
++
++config USB_EHCI_FSL
++ bool "Support for Freescale on-chip EHCI USB controller"
++ depends on USB_EHCI_HCD && FSL_SOC
++ select USB_EHCI_ROOT_HUB_TT
++ ---help---
++ Variation of ARC USB block used in some Freescale chips.
++
++config USB_EHCI_MXC
++ bool "Support for Freescale on-chip EHCI USB controller"
++ depends on USB_EHCI_HCD && ARCH_MXC
++ select USB_EHCI_ROOT_HUB_TT
++ ---help---
++ Variation of ARC USB block used in some Freescale chips.
++
++config USB_EHCI_HCD_PPC_OF
++ bool "EHCI support for PPC USB controller on OF platform bus"
++ depends on USB_EHCI_HCD && PPC_OF
++ default y
++ ---help---
++ Enables support for the USB controller present on the PowerPC
++ OpenFirmware platform bus.
++
++config USB_W90X900_EHCI
++ bool "W90X900(W90P910) EHCI support"
++ depends on USB_EHCI_HCD && ARCH_W90X900
++ ---help---
++ Enables support for the W90X900 USB controller
++
++config USB_OXU210HP_HCD
++ tristate "OXU210HP HCD support"
++ depends on USB
++ ---help---
++ The OXU210HP is an USB host/OTG/device controller. Enable this
++ option if your board has this chip. If unsure, say N.
++
++ This driver does not support isochronous transfers and doesn't
++ implement OTG nor USB device controllers.
++
++ To compile this driver as a module, choose M here: the
++ module will be called oxu210hp-hcd.
++
++config USB_ISP116X_HCD
++ tristate "ISP116X HCD support"
++ depends on USB
++ ---help---
++ The ISP1160 and ISP1161 chips are USB host controllers. Enable this
++ option if your board has this chip. If unsure, say N.
++
++ This driver does not support isochronous transfers.
++
++ To compile this driver as a module, choose M here: the
++ module will be called isp116x-hcd.
++
++config USB_ISP1760_HCD
++ tristate "ISP 1760 HCD support"
++ depends on USB && EXPERIMENTAL
++ ---help---
++ The ISP1760 chip is a USB 2.0 host controller.
++
++ This driver does not support isochronous transfers or OTG.
++ This USB controller is usually attached to a non-DMA-Master
++ capable bus. NXP's eval kit brings this chip on PCI card
++ where the chip itself is behind a PLB to simulate such
++ a bus.
++
++ To compile this driver as a module, choose M here: the
++ module will be called isp1760.
++
++config USB_ISP1362_HCD
++ tristate "ISP1362 HCD support"
++ depends on USB
++ default N
++ ---help---
++ Supports the Philips ISP1362 chip as a host controller
++
++ This driver does not support isochronous transfers.
++
++ To compile this driver as a module, choose M here: the
++ module will be called isp1362-hcd.
++
++config USB_OHCI_HCD
++ tristate "OHCI HCD support"
++ depends on USB && USB_ARCH_HAS_OHCI
++ select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
++ select USB_OTG_UTILS if ARCH_OMAP
++ ---help---
++ The Open Host Controller Interface (OHCI) is a standard for accessing
++ USB 1.1 host controller hardware. It does more in hardware than Intel's
++ UHCI specification. If your USB host controller follows the OHCI spec,
++ say Y. On most non-x86 systems, and on x86 hardware that's not using a
++ USB controller from Intel or VIA, this is appropriate. If your host
++ controller doesn't use PCI, this is probably appropriate. For a PCI
++ based system where you're not sure, the "lspci -v" entry will list the
++ right "prog-if" for your USB controller(s): EHCI, OHCI, or UHCI.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ohci-hcd.
++
++config USB_OHCI_HCD_OMAP1
++ bool "OHCI support for OMAP1/2 chips"
++ depends on USB_OHCI_HCD && (ARCH_OMAP1 || ARCH_OMAP2)
++ default y
++ ---help---
++ Enables support for the OHCI controller on OMAP1/2 chips.
++
++config USB_OHCI_HCD_OMAP3
++ bool "OHCI support for OMAP3 and later chips"
++ depends on USB_OHCI_HCD && (ARCH_OMAP3 || ARCH_OMAP4)
++ default y
++ ---help---
++ Enables support for the on-chip OHCI controller on
++ OMAP3 and later chips.
++
++config USB_OHCI_HCD_PPC_SOC
++ bool "OHCI support for on-chip PPC USB controller"
++ depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
++ default y
++ select USB_OHCI_BIG_ENDIAN_DESC
++ select USB_OHCI_BIG_ENDIAN_MMIO
++ ---help---
++ Enables support for the USB controller on the MPC52xx or
++ STB03xxx processor chip. If unsure, say Y.
++
++config USB_OHCI_HCD_PPC_OF_BE
++ bool "OHCI support for OF platform bus (big endian)"
++ depends on USB_OHCI_HCD && PPC_OF
++ select USB_OHCI_BIG_ENDIAN_DESC
++ select USB_OHCI_BIG_ENDIAN_MMIO
++ ---help---
++ Enables support for big-endian USB controllers present on the
++ OpenFirmware platform bus.
++
++config USB_OHCI_HCD_PPC_OF_LE
++ bool "OHCI support for OF platform bus (little endian)"
++ depends on USB_OHCI_HCD && PPC_OF
++ select USB_OHCI_LITTLE_ENDIAN
++ ---help---
++ Enables support for little-endian USB controllers present on the
++ OpenFirmware platform bus.
++
++config USB_OHCI_HCD_PPC_OF
++ bool
++ depends on USB_OHCI_HCD && PPC_OF
++ default USB_OHCI_HCD_PPC_OF_BE || USB_OHCI_HCD_PPC_OF_LE
++
++config USB_OHCI_HCD_PCI
++ bool "OHCI support for PCI-bus USB controllers"
++ depends on USB_OHCI_HCD && PCI && (STB03xxx || PPC_MPC52xx || USB_OHCI_HCD_PPC_OF)
++ default y
++ select USB_OHCI_LITTLE_ENDIAN
++ ---help---
++ Enables support for PCI-bus plug-in USB controller cards.
++ If unsure, say Y.
++
++config USB_OHCI_HCD_SSB
++ bool "OHCI support for Broadcom SSB OHCI core"
++ depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD) && EXPERIMENTAL
++ default n
++ ---help---
++ Support for the Sonics Silicon Backplane (SSB) attached
++ Broadcom USB OHCI core.
++
++ This device is present in some embedded devices with
++ Broadcom based SSB bus.
++
++ If unsure, say N.
++
++config USB_OHCI_BIG_ENDIAN_DESC
++ bool
++ depends on USB_OHCI_HCD
++ default n
++
++config USB_OHCI_BIG_ENDIAN_MMIO
++ bool
++ depends on USB_OHCI_HCD
++ default n
++
++config USB_OHCI_LITTLE_ENDIAN
++ bool
++ depends on USB_OHCI_HCD
++ default n if STB03xxx || PPC_MPC52xx
++ default y
++
++config USB_UHCI_HCD
++ tristate "UHCI HCD (most Intel and VIA) support"
++ depends on USB && PCI
++ ---help---
++ The Universal Host Controller Interface is a standard by Intel for
++ accessing the USB hardware in the PC (which is also called the USB
++ host controller). If your USB host controller conforms to this
++ standard, you may want to say Y, but see below. All recent boards
++ with Intel PCI chipsets (like intel 430TX, 440FX, 440LX, 440BX,
++ i810, i820) conform to this standard. Also all VIA PCI chipsets
++ (like VIA VP2, VP3, MVP3, Apollo Pro, Apollo Pro II or Apollo Pro
++ 133). If unsure, say Y.
++
++ To compile this driver as a module, choose M here: the
++ module will be called uhci-hcd.
++
++config USB_FHCI_HCD
++ tristate "Freescale QE USB Host Controller support"
++ depends on USB && OF_GPIO && QE_GPIO && QUICC_ENGINE
++ select FSL_GTM
++ select QE_USB
++ help
++ This driver enables support for Freescale QE USB Host Controller
++ (as found on MPC8360 and MPC8323 processors), the driver supports
++ Full and Low Speed USB.
++
++config FHCI_DEBUG
++ bool "Freescale QE USB Host Controller debug support"
++ depends on USB_FHCI_HCD && DEBUG_FS
++ help
++ Say "y" to see some FHCI debug information and statistics
++ throught debugfs.
++
++config USB_U132_HCD
++ tristate "Elan U132 Adapter Host Controller"
++ depends on USB && USB_FTDI_ELAN
++ default M
++ help
++ The U132 adapter is a USB to CardBus adapter specifically designed
++ for PC cards that contain an OHCI host controller. Typical PC cards
++ are the Orange Mobile 3G Option GlobeTrotter Fusion card. The U132
++ adapter will *NOT* work with PC cards that do not contain an OHCI
++ controller.
++
++ For those PC cards that contain multiple OHCI controllers only the
++ first one is used.
++
++ The driver consists of two modules, the "ftdi-elan" module is a
++ USB client driver that interfaces to the FTDI chip within ELAN's
++ USB-to-PCMCIA adapter, and this "u132-hcd" module is a USB host
++ controller driver that talks to the OHCI controller within the
++ CardBus cards that are inserted in the U132 adapter.
++
++ This driver has been tested with a CardBus OHCI USB adapter, and
++ worked with a USB PEN Drive inserted into the first USB port of
++ the PCCARD. A rather pointless thing to do, but useful for testing.
++
++ It is safe to say M here.
++
++ See also <http://www.elandigitalsystems.com/support/ufaq/u132linux.php>
++
++config USB_SL811_HCD
++ tristate "SL811HS HCD support"
++ depends on USB
++ help
++ The SL811HS is a single-port USB controller that supports either
++ host side or peripheral side roles. Enable this option if your
++ board has this chip, and you want to use it as a host controller.
++ If unsure, say N.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sl811-hcd.
++
++config USB_SL811_CS
++ tristate "CF/PCMCIA support for SL811HS HCD"
++ depends on USB_SL811_HCD && PCMCIA
++ help
++ Wraps a PCMCIA driver around the SL811HS HCD, supporting the RATOC
++ REX-CFU1U CF card (often used with PDAs). If unsure, say N.
++
++ To compile this driver as a module, choose M here: the
++ module will be called "sl811_cs".
++
++config USB_R8A66597_HCD
++ tristate "R8A66597 HCD support"
++ depends on USB
++ help
++ The R8A66597 is a USB 2.0 host and peripheral controller.
++
++ Enable this option if your board has this chip, and you want
++ to use it as a host controller. If unsure, say N.
++
++ To compile this driver as a module, choose M here: the
++ module will be called r8a66597-hcd.
++
++config USB_WHCI_HCD
++ tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"
++ depends on EXPERIMENTAL
++ depends on PCI && USB
++ select USB_WUSB
++ select UWB_WHCI
++ help
++ A driver for PCI-based Wireless USB Host Controllers that are
++ compliant with the WHCI specification.
++
++ To compile this driver a module, choose M here: the module
++ will be called "whci-hcd".
++
++config USB_HWA_HCD
++ tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)"
++ depends on EXPERIMENTAL
++ depends on USB
++ select USB_WUSB
++ select UWB_HWA
++ help
++ This driver enables you to connect Wireless USB devices to
++ your system using a Host Wire Adaptor USB dongle. This is an
++ UWB Radio Controller and WUSB Host Controller connected to
++ your machine via USB (specified in WUSB1.0).
++
++ To compile this driver a module, choose M here: the module
++ will be called "hwa-hc".
++
++config USB_IMX21_HCD
++ tristate "iMX21 HCD support"
++ depends on USB && ARM && MACH_MX21
++ help
++ This driver enables support for the on-chip USB host in the
++ iMX21 processor.
++
++ To compile this driver as a module, choose M here: the
++ module will be called "imx21-hcd".
++
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ohci-ar71xx.c linux-2.6.35.7/drivers/usb/host/ohci-ar71xx.c
+--- linux-2.6.35.7.orig/drivers/usb/host/ohci-ar71xx.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/usb/host/ohci-ar71xx.c 2010-10-14 20:28:01.428101246 +0200
@@ -0,0 +1,165 @@
+/*
+ * OHCI HCD (Host Controller Driver) for USB.
@@ -16994,10 +27120,10 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/ohci-ar71xx.c linux-2.6.34/drivers/
+ .owner = THIS_MODULE,
+ },
+};
-diff -Nur linux-2.6.34.orig/drivers/usb/host/ohci-hcd.c linux-2.6.34/drivers/usb/host/ohci-hcd.c
---- linux-2.6.34.orig/drivers/usb/host/ohci-hcd.c 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/usb/host/ohci-hcd.c 2010-05-25 18:46:13.132223090 +0200
-@@ -1090,6 +1090,11 @@
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ohci-hcd.c linux-2.6.35.7/drivers/usb/host/ohci-hcd.c
+--- linux-2.6.35.7.orig/drivers/usb/host/ohci-hcd.c 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/usb/host/ohci-hcd.c 2010-10-14 20:28:01.468101083 +0200
+@@ -1095,6 +1095,11 @@
#define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver
#endif
@@ -17008,10 +27134,1291 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/ohci-hcd.c linux-2.6.34/drivers/usb
+
#if !defined(PCI_DRIVER) && \
!defined(PLATFORM_DRIVER) && \
- !defined(OF_PLATFORM_DRIVER) && \
-diff -Nur linux-2.6.34.orig/drivers/watchdog/ar71xx_wdt.c linux-2.6.34/drivers/watchdog/ar71xx_wdt.c
---- linux-2.6.34.orig/drivers/watchdog/ar71xx_wdt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/watchdog/ar71xx_wdt.c 2010-05-25 18:46:13.163473025 +0200
+ !defined(OMAP1_PLATFORM_DRIVER) && \
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/ohci-hcd.c.orig linux-2.6.35.7/drivers/usb/host/ohci-hcd.c.orig
+--- linux-2.6.35.7.orig/drivers/usb/host/ohci-hcd.c.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/usb/host/ohci-hcd.c.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,1277 @@
++/*
++ * OHCI HCD (Host Controller Driver) for USB.
++ *
++ * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
++ * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
++ *
++ * [ Initialisation is based on Linus' ]
++ * [ uhci code and gregs ohci fragments ]
++ * [ (C) Copyright 1999 Linus Torvalds ]
++ * [ (C) Copyright 1999 Gregory P. Smith]
++ *
++ *
++ * OHCI is the main "non-Intel/VIA" standard for USB 1.1 host controller
++ * interfaces (though some non-x86 Intel chips use it). It supports
++ * smarter hardware than UHCI. A download link for the spec available
++ * through the http://www.usb.org website.
++ *
++ * This file is licenced under the GPL.
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/pci.h>
++#include <linux/kernel.h>
++#include <linux/delay.h>
++#include <linux/ioport.h>
++#include <linux/sched.h>
++#include <linux/slab.h>
++#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/timer.h>
++#include <linux/list.h>
++#include <linux/usb.h>
++#include <linux/usb/otg.h>
++#include <linux/usb/hcd.h>
++#include <linux/dma-mapping.h>
++#include <linux/dmapool.h>
++#include <linux/workqueue.h>
++#include <linux/debugfs.h>
++
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <asm/system.h>
++#include <asm/unaligned.h>
++#include <asm/byteorder.h>
++
++
++#define DRIVER_AUTHOR "Roman Weissgaerber, David Brownell"
++#define DRIVER_DESC "USB 1.1 'Open' Host Controller (OHCI) Driver"
++
++/*-------------------------------------------------------------------------*/
++
++#undef OHCI_VERBOSE_DEBUG /* not always helpful */
++
++/* For initializing controller (mask in an HCFS mode too) */
++#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
++#define OHCI_INTR_INIT \
++ (OHCI_INTR_MIE | OHCI_INTR_RHSC | OHCI_INTR_UE \
++ | OHCI_INTR_RD | OHCI_INTR_WDH)
++
++#ifdef __hppa__
++/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
++#define IR_DISABLE
++#endif
++
++#ifdef CONFIG_ARCH_OMAP
++/* OMAP doesn't support IR (no SMM; not needed) */
++#define IR_DISABLE
++#endif
++
++/*-------------------------------------------------------------------------*/
++
++static const char hcd_name [] = "ohci_hcd";
++
++#define STATECHANGE_DELAY msecs_to_jiffies(300)
++
++#include "ohci.h"
++
++static void ohci_dump (struct ohci_hcd *ohci, int verbose);
++static int ohci_init (struct ohci_hcd *ohci);
++static void ohci_stop (struct usb_hcd *hcd);
++
++#if defined(CONFIG_PM) || defined(CONFIG_PCI)
++static int ohci_restart (struct ohci_hcd *ohci);
++#endif
++
++#ifdef CONFIG_PCI
++static void quirk_amd_pll(int state);
++static void amd_iso_dev_put(void);
++static void sb800_prefetch(struct ohci_hcd *ohci, int on);
++#else
++static inline void quirk_amd_pll(int state)
++{
++ return;
++}
++static inline void amd_iso_dev_put(void)
++{
++ return;
++}
++static inline void sb800_prefetch(struct ohci_hcd *ohci, int on)
++{
++ return;
++}
++#endif
++
++
++#include "ohci-hub.c"
++#include "ohci-dbg.c"
++#include "ohci-mem.c"
++#include "ohci-q.c"
++
++
++/*
++ * On architectures with edge-triggered interrupts we must never return
++ * IRQ_NONE.
++ */
++#if defined(CONFIG_SA1111) /* ... or other edge-triggered systems */
++#define IRQ_NOTMINE IRQ_HANDLED
++#else
++#define IRQ_NOTMINE IRQ_NONE
++#endif
++
++
++/* Some boards misreport power switching/overcurrent */
++static int distrust_firmware = 1;
++module_param (distrust_firmware, bool, 0);
++MODULE_PARM_DESC (distrust_firmware,
++ "true to distrust firmware power/overcurrent setup");
++
++/* Some boards leave IR set wrongly, since they fail BIOS/SMM handshakes */
++static int no_handshake = 0;
++module_param (no_handshake, bool, 0);
++MODULE_PARM_DESC (no_handshake, "true (not default) disables BIOS handshake");
++
++/*-------------------------------------------------------------------------*/
++
++/*
++ * queue up an urb for anything except the root hub
++ */
++static int ohci_urb_enqueue (
++ struct usb_hcd *hcd,
++ struct urb *urb,
++ gfp_t mem_flags
++) {
++ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
++ struct ed *ed;
++ urb_priv_t *urb_priv;
++ unsigned int pipe = urb->pipe;
++ int i, size = 0;
++ unsigned long flags;
++ int retval = 0;
++
++#ifdef OHCI_VERBOSE_DEBUG
++ urb_print(urb, "SUB", usb_pipein(pipe), -EINPROGRESS);
++#endif
++
++ /* every endpoint has a ed, locate and maybe (re)initialize it */
++ if (! (ed = ed_get (ohci, urb->ep, urb->dev, pipe, urb->interval)))
++ return -ENOMEM;
++
++ /* for the private part of the URB we need the number of TDs (size) */
++ switch (ed->type) {
++ case PIPE_CONTROL:
++ /* td_submit_urb() doesn't yet handle these */
++ if (urb->transfer_buffer_length > 4096)
++ return -EMSGSIZE;
++
++ /* 1 TD for setup, 1 for ACK, plus ... */
++ size = 2;
++ /* FALLTHROUGH */
++ // case PIPE_INTERRUPT:
++ // case PIPE_BULK:
++ default:
++ /* one TD for every 4096 Bytes (can be upto 8K) */
++ size += urb->transfer_buffer_length / 4096;
++ /* ... and for any remaining bytes ... */
++ if ((urb->transfer_buffer_length % 4096) != 0)
++ size++;
++ /* ... and maybe a zero length packet to wrap it up */
++ if (size == 0)
++ size++;
++ else if ((urb->transfer_flags & URB_ZERO_PACKET) != 0
++ && (urb->transfer_buffer_length
++ % usb_maxpacket (urb->dev, pipe,
++ usb_pipeout (pipe))) == 0)
++ size++;
++ break;
++ case PIPE_ISOCHRONOUS: /* number of packets from URB */
++ size = urb->number_of_packets;
++ break;
++ }
++
++ /* allocate the private part of the URB */
++ urb_priv = kzalloc (sizeof (urb_priv_t) + size * sizeof (struct td *),
++ mem_flags);
++ if (!urb_priv)
++ return -ENOMEM;
++ INIT_LIST_HEAD (&urb_priv->pending);
++ urb_priv->length = size;
++ urb_priv->ed = ed;
++
++ /* allocate the TDs (deferring hash chain updates) */
++ for (i = 0; i < size; i++) {
++ urb_priv->td [i] = td_alloc (ohci, mem_flags);
++ if (!urb_priv->td [i]) {
++ urb_priv->length = i;
++ urb_free_priv (ohci, urb_priv);
++ return -ENOMEM;
++ }
++ }
++
++ spin_lock_irqsave (&ohci->lock, flags);
++
++ /* don't submit to a dead HC */
++ if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) {
++ retval = -ENODEV;
++ goto fail;
++ }
++ if (!HC_IS_RUNNING(hcd->state)) {
++ retval = -ENODEV;
++ goto fail;
++ }
++ retval = usb_hcd_link_urb_to_ep(hcd, urb);
++ if (retval)
++ goto fail;
++
++ /* schedule the ed if needed */
++ if (ed->state == ED_IDLE) {
++ retval = ed_schedule (ohci, ed);
++ if (retval < 0) {
++ usb_hcd_unlink_urb_from_ep(hcd, urb);
++ goto fail;
++ }
++ if (ed->type == PIPE_ISOCHRONOUS) {
++ u16 frame = ohci_frame_no(ohci);
++
++ /* delay a few frames before the first TD */
++ frame += max_t (u16, 8, ed->interval);
++ frame &= ~(ed->interval - 1);
++ frame |= ed->branch;
++ urb->start_frame = frame;
++
++ /* yes, only URB_ISO_ASAP is supported, and
++ * urb->start_frame is never used as input.
++ */
++ }
++ } else if (ed->type == PIPE_ISOCHRONOUS)
++ urb->start_frame = ed->last_iso + ed->interval;
++
++ /* fill the TDs and link them to the ed; and
++ * enable that part of the schedule, if needed
++ * and update count of queued periodic urbs
++ */
++ urb->hcpriv = urb_priv;
++ td_submit_urb (ohci, urb);
++
++fail:
++ if (retval)
++ urb_free_priv (ohci, urb_priv);
++ spin_unlock_irqrestore (&ohci->lock, flags);
++ return retval;
++}
++
++/*
++ * decouple the URB from the HC queues (TDs, urb_priv).
++ * reporting is always done
++ * asynchronously, and we might be dealing with an urb that's
++ * partially transferred, or an ED with other urbs being unlinked.
++ */
++static int ohci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
++{
++ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
++ unsigned long flags;
++ int rc;
++
++#ifdef OHCI_VERBOSE_DEBUG
++ urb_print(urb, "UNLINK", 1, status);
++#endif
++
++ spin_lock_irqsave (&ohci->lock, flags);
++ rc = usb_hcd_check_unlink_urb(hcd, urb, status);
++ if (rc) {
++ ; /* Do nothing */
++ } else if (HC_IS_RUNNING(hcd->state)) {
++ urb_priv_t *urb_priv;
++
++ /* Unless an IRQ completed the unlink while it was being
++ * handed to us, flag it for unlink and giveback, and force
++ * some upcoming INTR_SF to call finish_unlinks()
++ */
++ urb_priv = urb->hcpriv;
++ if (urb_priv) {
++ if (urb_priv->ed->state == ED_OPER)
++ start_ed_unlink (ohci, urb_priv->ed);
++ }
++ } else {
++ /*
++ * with HC dead, we won't respect hc queue pointers
++ * any more ... just clean up every urb's memory.
++ */
++ if (urb->hcpriv)
++ finish_urb(ohci, urb, status);
++ }
++ spin_unlock_irqrestore (&ohci->lock, flags);
++ return rc;
++}
++
++/*-------------------------------------------------------------------------*/
++
++/* frees config/altsetting state for endpoints,
++ * including ED memory, dummy TD, and bulk/intr data toggle
++ */
++
++static void
++ohci_endpoint_disable (struct usb_hcd *hcd, struct usb_host_endpoint *ep)
++{
++ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
++ unsigned long flags;
++ struct ed *ed = ep->hcpriv;
++ unsigned limit = 1000;
++
++ /* ASSERT: any requests/urbs are being unlinked */
++ /* ASSERT: nobody can be submitting urbs for this any more */
++
++ if (!ed)
++ return;
++
++rescan:
++ spin_lock_irqsave (&ohci->lock, flags);
++
++ if (!HC_IS_RUNNING (hcd->state)) {
++sanitize:
++ ed->state = ED_IDLE;
++ if (quirk_zfmicro(ohci) && ed->type == PIPE_INTERRUPT)
++ ohci->eds_scheduled--;
++ finish_unlinks (ohci, 0);
++ }
++
++ switch (ed->state) {
++ case ED_UNLINK: /* wait for hw to finish? */
++ /* major IRQ delivery trouble loses INTR_SF too... */
++ if (limit-- == 0) {
++ ohci_warn(ohci, "ED unlink timeout\n");
++ if (quirk_zfmicro(ohci)) {
++ ohci_warn(ohci, "Attempting ZF TD recovery\n");
++ ohci->ed_to_check = ed;
++ ohci->zf_delay = 2;
++ }
++ goto sanitize;
++ }
++ spin_unlock_irqrestore (&ohci->lock, flags);
++ schedule_timeout_uninterruptible(1);
++ goto rescan;
++ case ED_IDLE: /* fully unlinked */
++ if (list_empty (&ed->td_list)) {
++ td_free (ohci, ed->dummy);
++ ed_free (ohci, ed);
++ break;
++ }
++ /* else FALL THROUGH */
++ default:
++ /* caller was supposed to have unlinked any requests;
++ * that's not our job. can't recover; must leak ed.
++ */
++ ohci_err (ohci, "leak ed %p (#%02x) state %d%s\n",
++ ed, ep->desc.bEndpointAddress, ed->state,
++ list_empty (&ed->td_list) ? "" : " (has tds)");
++ td_free (ohci, ed->dummy);
++ break;
++ }
++ ep->hcpriv = NULL;
++ spin_unlock_irqrestore (&ohci->lock, flags);
++ return;
++}
++
++static int ohci_get_frame (struct usb_hcd *hcd)
++{
++ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
++
++ return ohci_frame_no(ohci);
++}
++
++static void ohci_usb_reset (struct ohci_hcd *ohci)
++{
++ ohci->hc_control = ohci_readl (ohci, &ohci->regs->control);
++ ohci->hc_control &= OHCI_CTRL_RWC;
++ ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
++}
++
++/* ohci_shutdown forcibly disables IRQs and DMA, helping kexec and
++ * other cases where the next software may expect clean state from the
++ * "firmware". this is bus-neutral, unlike shutdown() methods.
++ */
++static void
++ohci_shutdown (struct usb_hcd *hcd)
++{
++ struct ohci_hcd *ohci;
++
++ ohci = hcd_to_ohci (hcd);
++ ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
++ ohci_usb_reset (ohci);
++ /* flush the writes */
++ (void) ohci_readl (ohci, &ohci->regs->control);
++}
++
++static int check_ed(struct ohci_hcd *ohci, struct ed *ed)
++{
++ return (hc32_to_cpu(ohci, ed->hwINFO) & ED_IN) != 0
++ && (hc32_to_cpu(ohci, ed->hwHeadP) & TD_MASK)
++ == (hc32_to_cpu(ohci, ed->hwTailP) & TD_MASK)
++ && !list_empty(&ed->td_list);
++}
++
++/* ZF Micro watchdog timer callback. The ZF Micro chipset sometimes completes
++ * an interrupt TD but neglects to add it to the donelist. On systems with
++ * this chipset, we need to periodically check the state of the queues to look
++ * for such "lost" TDs.
++ */
++static void unlink_watchdog_func(unsigned long _ohci)
++{
++ unsigned long flags;
++ unsigned max;
++ unsigned seen_count = 0;
++ unsigned i;
++ struct ed **seen = NULL;
++ struct ohci_hcd *ohci = (struct ohci_hcd *) _ohci;
++
++ spin_lock_irqsave(&ohci->lock, flags);
++ max = ohci->eds_scheduled;
++ if (!max)
++ goto done;
++
++ if (ohci->ed_to_check)
++ goto out;
++
++ seen = kcalloc(max, sizeof *seen, GFP_ATOMIC);
++ if (!seen)
++ goto out;
++
++ for (i = 0; i < NUM_INTS; i++) {
++ struct ed *ed = ohci->periodic[i];
++
++ while (ed) {
++ unsigned temp;
++
++ /* scan this branch of the periodic schedule tree */
++ for (temp = 0; temp < seen_count; temp++) {
++ if (seen[temp] == ed) {
++ /* we've checked it and what's after */
++ ed = NULL;
++ break;
++ }
++ }
++ if (!ed)
++ break;
++ seen[seen_count++] = ed;
++ if (!check_ed(ohci, ed)) {
++ ed = ed->ed_next;
++ continue;
++ }
++
++ /* HC's TD list is empty, but HCD sees at least one
++ * TD that's not been sent through the donelist.
++ */
++ ohci->ed_to_check = ed;
++ ohci->zf_delay = 2;
++
++ /* The HC may wait until the next frame to report the
++ * TD as done through the donelist and INTR_WDH. (We
++ * just *assume* it's not a multi-TD interrupt URB;
++ * those could defer the IRQ more than one frame, using
++ * DI...) Check again after the next INTR_SF.
++ */
++ ohci_writel(ohci, OHCI_INTR_SF,
++ &ohci->regs->intrstatus);
++ ohci_writel(ohci, OHCI_INTR_SF,
++ &ohci->regs->intrenable);
++
++ /* flush those writes */
++ (void) ohci_readl(ohci, &ohci->regs->control);
++
++ goto out;
++ }
++ }
++out:
++ kfree(seen);
++ if (ohci->eds_scheduled)
++ mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ));
++done:
++ spin_unlock_irqrestore(&ohci->lock, flags);
++}
++
++/*-------------------------------------------------------------------------*
++ * HC functions
++ *-------------------------------------------------------------------------*/
++
++/* init memory, and kick BIOS/SMM off */
++
++static int ohci_init (struct ohci_hcd *ohci)
++{
++ int ret;
++ struct usb_hcd *hcd = ohci_to_hcd(ohci);
++
++ if (distrust_firmware)
++ ohci->flags |= OHCI_QUIRK_HUB_POWER;
++
++ disable (ohci);
++ ohci->regs = hcd->regs;
++
++ /* REVISIT this BIOS handshake is now moved into PCI "quirks", and
++ * was never needed for most non-PCI systems ... remove the code?
++ */
++
++#ifndef IR_DISABLE
++ /* SMM owns the HC? not for long! */
++ if (!no_handshake && ohci_readl (ohci,
++ &ohci->regs->control) & OHCI_CTRL_IR) {
++ u32 temp;
++
++ ohci_dbg (ohci, "USB HC TakeOver from BIOS/SMM\n");
++
++ /* this timeout is arbitrary. we make it long, so systems
++ * depending on usb keyboards may be usable even if the
++ * BIOS/SMM code seems pretty broken.
++ */
++ temp = 500; /* arbitrary: five seconds */
++
++ ohci_writel (ohci, OHCI_INTR_OC, &ohci->regs->intrenable);
++ ohci_writel (ohci, OHCI_OCR, &ohci->regs->cmdstatus);
++ while (ohci_readl (ohci, &ohci->regs->control) & OHCI_CTRL_IR) {
++ msleep (10);
++ if (--temp == 0) {
++ ohci_err (ohci, "USB HC takeover failed!"
++ " (BIOS/SMM bug)\n");
++ return -EBUSY;
++ }
++ }
++ ohci_usb_reset (ohci);
++ }
++#endif
++
++ /* Disable HC interrupts */
++ ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
++
++ /* flush the writes, and save key bits like RWC */
++ if (ohci_readl (ohci, &ohci->regs->control) & OHCI_CTRL_RWC)
++ ohci->hc_control |= OHCI_CTRL_RWC;
++
++ /* Read the number of ports unless overridden */
++ if (ohci->num_ports == 0)
++ ohci->num_ports = roothub_a(ohci) & RH_A_NDP;
++
++ if (ohci->hcca)
++ return 0;
++
++ ohci->hcca = dma_alloc_coherent (hcd->self.controller,
++ sizeof *ohci->hcca, &ohci->hcca_dma, 0);
++ if (!ohci->hcca)
++ return -ENOMEM;
++
++ if ((ret = ohci_mem_init (ohci)) < 0)
++ ohci_stop (hcd);
++ else {
++ create_debug_files (ohci);
++ }
++
++ return ret;
++}
++
++/*-------------------------------------------------------------------------*/
++
++/* Start an OHCI controller, set the BUS operational
++ * resets USB and controller
++ * enable interrupts
++ */
++static int ohci_run (struct ohci_hcd *ohci)
++{
++ u32 mask, val;
++ int first = ohci->fminterval == 0;
++ struct usb_hcd *hcd = ohci_to_hcd(ohci);
++
++ disable (ohci);
++
++ /* boot firmware should have set this up (5.1.1.3.1) */
++ if (first) {
++
++ val = ohci_readl (ohci, &ohci->regs->fminterval);
++ ohci->fminterval = val & 0x3fff;
++ if (ohci->fminterval != FI)
++ ohci_dbg (ohci, "fminterval delta %d\n",
++ ohci->fminterval - FI);
++ ohci->fminterval |= FSMP (ohci->fminterval) << 16;
++ /* also: power/overcurrent flags in roothub.a */
++ }
++
++ /* Reset USB nearly "by the book". RemoteWakeupConnected has
++ * to be checked in case boot firmware (BIOS/SMM/...) has set up
++ * wakeup in a way the bus isn't aware of (e.g., legacy PCI PM).
++ * If the bus glue detected wakeup capability then it should
++ * already be enabled; if so we'll just enable it again.
++ */
++ if ((ohci->hc_control & OHCI_CTRL_RWC) != 0)
++ device_set_wakeup_capable(hcd->self.controller, 1);
++
++ switch (ohci->hc_control & OHCI_CTRL_HCFS) {
++ case OHCI_USB_OPER:
++ val = 0;
++ break;
++ case OHCI_USB_SUSPEND:
++ case OHCI_USB_RESUME:
++ ohci->hc_control &= OHCI_CTRL_RWC;
++ ohci->hc_control |= OHCI_USB_RESUME;
++ val = 10 /* msec wait */;
++ break;
++ // case OHCI_USB_RESET:
++ default:
++ ohci->hc_control &= OHCI_CTRL_RWC;
++ ohci->hc_control |= OHCI_USB_RESET;
++ val = 50 /* msec wait */;
++ break;
++ }
++ ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
++ // flush the writes
++ (void) ohci_readl (ohci, &ohci->regs->control);
++ msleep(val);
++
++ memset (ohci->hcca, 0, sizeof (struct ohci_hcca));
++
++ /* 2msec timelimit here means no irqs/preempt */
++ spin_lock_irq (&ohci->lock);
++
++retry:
++ /* HC Reset requires max 10 us delay */
++ ohci_writel (ohci, OHCI_HCR, &ohci->regs->cmdstatus);
++ val = 30; /* ... allow extra time */
++ while ((ohci_readl (ohci, &ohci->regs->cmdstatus) & OHCI_HCR) != 0) {
++ if (--val == 0) {
++ spin_unlock_irq (&ohci->lock);
++ ohci_err (ohci, "USB HC reset timed out!\n");
++ return -1;
++ }
++ udelay (1);
++ }
++
++ /* now we're in the SUSPEND state ... must go OPERATIONAL
++ * within 2msec else HC enters RESUME
++ *
++ * ... but some hardware won't init fmInterval "by the book"
++ * (SiS, OPTi ...), so reset again instead. SiS doesn't need
++ * this if we write fmInterval after we're OPERATIONAL.
++ * Unclear about ALi, ServerWorks, and others ... this could
++ * easily be a longstanding bug in chip init on Linux.
++ */
++ if (ohci->flags & OHCI_QUIRK_INITRESET) {
++ ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
++ // flush those writes
++ (void) ohci_readl (ohci, &ohci->regs->control);
++ }
++
++ /* Tell the controller where the control and bulk lists are
++ * The lists are empty now. */
++ ohci_writel (ohci, 0, &ohci->regs->ed_controlhead);
++ ohci_writel (ohci, 0, &ohci->regs->ed_bulkhead);
++
++ /* a reset clears this */
++ ohci_writel (ohci, (u32) ohci->hcca_dma, &ohci->regs->hcca);
++
++ periodic_reinit (ohci);
++
++ /* some OHCI implementations are finicky about how they init.
++ * bogus values here mean not even enumeration could work.
++ */
++ if ((ohci_readl (ohci, &ohci->regs->fminterval) & 0x3fff0000) == 0
++ || !ohci_readl (ohci, &ohci->regs->periodicstart)) {
++ if (!(ohci->flags & OHCI_QUIRK_INITRESET)) {
++ ohci->flags |= OHCI_QUIRK_INITRESET;
++ ohci_dbg (ohci, "enabling initreset quirk\n");
++ goto retry;
++ }
++ spin_unlock_irq (&ohci->lock);
++ ohci_err (ohci, "init err (%08x %04x)\n",
++ ohci_readl (ohci, &ohci->regs->fminterval),
++ ohci_readl (ohci, &ohci->regs->periodicstart));
++ return -EOVERFLOW;
++ }
++
++ /* use rhsc irqs after khubd is fully initialized */
++ hcd->poll_rh = 1;
++ hcd->uses_new_polling = 1;
++
++ /* start controller operations */
++ ohci->hc_control &= OHCI_CTRL_RWC;
++ ohci->hc_control |= OHCI_CONTROL_INIT | OHCI_USB_OPER;
++ ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
++ hcd->state = HC_STATE_RUNNING;
++
++ /* wake on ConnectStatusChange, matching external hubs */
++ ohci_writel (ohci, RH_HS_DRWE, &ohci->regs->roothub.status);
++
++ /* Choose the interrupts we care about now, others later on demand */
++ mask = OHCI_INTR_INIT;
++ ohci_writel (ohci, ~0, &ohci->regs->intrstatus);
++ ohci_writel (ohci, mask, &ohci->regs->intrenable);
++
++ /* handle root hub init quirks ... */
++ val = roothub_a (ohci);
++ val &= ~(RH_A_PSM | RH_A_OCPM);
++ if (ohci->flags & OHCI_QUIRK_SUPERIO) {
++ /* NSC 87560 and maybe others */
++ val |= RH_A_NOCP;
++ val &= ~(RH_A_POTPGT | RH_A_NPS);
++ ohci_writel (ohci, val, &ohci->regs->roothub.a);
++ } else if ((ohci->flags & OHCI_QUIRK_AMD756) ||
++ (ohci->flags & OHCI_QUIRK_HUB_POWER)) {
++ /* hub power always on; required for AMD-756 and some
++ * Mac platforms. ganged overcurrent reporting, if any.
++ */
++ val |= RH_A_NPS;
++ ohci_writel (ohci, val, &ohci->regs->roothub.a);
++ }
++ ohci_writel (ohci, RH_HS_LPSC, &ohci->regs->roothub.status);
++ ohci_writel (ohci, (val & RH_A_NPS) ? 0 : RH_B_PPCM,
++ &ohci->regs->roothub.b);
++ // flush those writes
++ (void) ohci_readl (ohci, &ohci->regs->control);
++
++ ohci->next_statechange = jiffies + STATECHANGE_DELAY;
++ spin_unlock_irq (&ohci->lock);
++
++ // POTPGT delay is bits 24-31, in 2 ms units.
++ mdelay ((val >> 23) & 0x1fe);
++ hcd->state = HC_STATE_RUNNING;
++
++ if (quirk_zfmicro(ohci)) {
++ /* Create timer to watch for bad queue state on ZF Micro */
++ setup_timer(&ohci->unlink_watchdog, unlink_watchdog_func,
++ (unsigned long) ohci);
++
++ ohci->eds_scheduled = 0;
++ ohci->ed_to_check = NULL;
++ }
++
++ ohci_dump (ohci, 1);
++
++ return 0;
++}
++
++/*-------------------------------------------------------------------------*/
++
++/* an interrupt happens */
++
++static irqreturn_t ohci_irq (struct usb_hcd *hcd)
++{
++ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
++ struct ohci_regs __iomem *regs = ohci->regs;
++ int ints;
++
++ /* Read interrupt status (and flush pending writes). We ignore the
++ * optimization of checking the LSB of hcca->done_head; it doesn't
++ * work on all systems (edge triggering for OHCI can be a factor).
++ */
++ ints = ohci_readl(ohci, &regs->intrstatus);
++
++ /* Check for an all 1's result which is a typical consequence
++ * of dead, unclocked, or unplugged (CardBus...) devices
++ */
++ if (ints == ~(u32)0) {
++ disable (ohci);
++ ohci_dbg (ohci, "device removed!\n");
++ return IRQ_HANDLED;
++ }
++
++ /* We only care about interrupts that are enabled */
++ ints &= ohci_readl(ohci, &regs->intrenable);
++
++ /* interrupt for some other device? */
++ if (ints == 0)
++ return IRQ_NOTMINE;
++
++ if (ints & OHCI_INTR_UE) {
++ // e.g. due to PCI Master/Target Abort
++ if (quirk_nec(ohci)) {
++ /* Workaround for a silicon bug in some NEC chips used
++ * in Apple's PowerBooks. Adapted from Darwin code.
++ */
++ ohci_err (ohci, "OHCI Unrecoverable Error, scheduling NEC chip restart\n");
++
++ ohci_writel (ohci, OHCI_INTR_UE, &regs->intrdisable);
++
++ schedule_work (&ohci->nec_work);
++ } else {
++ disable (ohci);
++ ohci_err (ohci, "OHCI Unrecoverable Error, disabled\n");
++ }
++
++ ohci_dump (ohci, 1);
++ ohci_usb_reset (ohci);
++ }
++
++ if (ints & OHCI_INTR_RHSC) {
++ ohci_vdbg(ohci, "rhsc\n");
++ ohci->next_statechange = jiffies + STATECHANGE_DELAY;
++ ohci_writel(ohci, OHCI_INTR_RD | OHCI_INTR_RHSC,
++ &regs->intrstatus);
++
++ /* NOTE: Vendors didn't always make the same implementation
++ * choices for RHSC. Many followed the spec; RHSC triggers
++ * on an edge, like setting and maybe clearing a port status
++ * change bit. With others it's level-triggered, active
++ * until khubd clears all the port status change bits. We'll
++ * always disable it here and rely on polling until khubd
++ * re-enables it.
++ */
++ ohci_writel(ohci, OHCI_INTR_RHSC, &regs->intrdisable);
++ usb_hcd_poll_rh_status(hcd);
++ }
++
++ /* For connect and disconnect events, we expect the controller
++ * to turn on RHSC along with RD. But for remote wakeup events
++ * this might not happen.
++ */
++ else if (ints & OHCI_INTR_RD) {
++ ohci_vdbg(ohci, "resume detect\n");
++ ohci_writel(ohci, OHCI_INTR_RD, &regs->intrstatus);
++ hcd->poll_rh = 1;
++ if (ohci->autostop) {
++ spin_lock (&ohci->lock);
++ ohci_rh_resume (ohci);
++ spin_unlock (&ohci->lock);
++ } else
++ usb_hcd_resume_root_hub(hcd);
++ }
++
++ if (ints & OHCI_INTR_WDH) {
++ spin_lock (&ohci->lock);
++ dl_done_list (ohci);
++ spin_unlock (&ohci->lock);
++ }
++
++ if (quirk_zfmicro(ohci) && (ints & OHCI_INTR_SF)) {
++ spin_lock(&ohci->lock);
++ if (ohci->ed_to_check) {
++ struct ed *ed = ohci->ed_to_check;
++
++ if (check_ed(ohci, ed)) {
++ /* HC thinks the TD list is empty; HCD knows
++ * at least one TD is outstanding
++ */
++ if (--ohci->zf_delay == 0) {
++ struct td *td = list_entry(
++ ed->td_list.next,
++ struct td, td_list);
++ ohci_warn(ohci,
++ "Reclaiming orphan TD %p\n",
++ td);
++ takeback_td(ohci, td);
++ ohci->ed_to_check = NULL;
++ }
++ } else
++ ohci->ed_to_check = NULL;
++ }
++ spin_unlock(&ohci->lock);
++ }
++
++ /* could track INTR_SO to reduce available PCI/... bandwidth */
++
++ /* handle any pending URB/ED unlinks, leaving INTR_SF enabled
++ * when there's still unlinking to be done (next frame).
++ */
++ spin_lock (&ohci->lock);
++ if (ohci->ed_rm_list)
++ finish_unlinks (ohci, ohci_frame_no(ohci));
++ if ((ints & OHCI_INTR_SF) != 0
++ && !ohci->ed_rm_list
++ && !ohci->ed_to_check
++ && HC_IS_RUNNING(hcd->state))
++ ohci_writel (ohci, OHCI_INTR_SF, &regs->intrdisable);
++ spin_unlock (&ohci->lock);
++
++ if (HC_IS_RUNNING(hcd->state)) {
++ ohci_writel (ohci, ints, &regs->intrstatus);
++ ohci_writel (ohci, OHCI_INTR_MIE, &regs->intrenable);
++ // flush those writes
++ (void) ohci_readl (ohci, &ohci->regs->control);
++ }
++
++ return IRQ_HANDLED;
++}
++
++/*-------------------------------------------------------------------------*/
++
++static void ohci_stop (struct usb_hcd *hcd)
++{
++ struct ohci_hcd *ohci = hcd_to_ohci (hcd);
++
++ ohci_dump (ohci, 1);
++
++ flush_scheduled_work();
++
++ ohci_usb_reset (ohci);
++ ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
++ free_irq(hcd->irq, hcd);
++ hcd->irq = -1;
++
++ if (quirk_zfmicro(ohci))
++ del_timer(&ohci->unlink_watchdog);
++ if (quirk_amdiso(ohci))
++ amd_iso_dev_put();
++
++ remove_debug_files (ohci);
++ ohci_mem_cleanup (ohci);
++ if (ohci->hcca) {
++ dma_free_coherent (hcd->self.controller,
++ sizeof *ohci->hcca,
++ ohci->hcca, ohci->hcca_dma);
++ ohci->hcca = NULL;
++ ohci->hcca_dma = 0;
++ }
++}
++
++/*-------------------------------------------------------------------------*/
++
++#if defined(CONFIG_PM) || defined(CONFIG_PCI)
++
++/* must not be called from interrupt context */
++static int ohci_restart (struct ohci_hcd *ohci)
++{
++ int temp;
++ int i;
++ struct urb_priv *priv;
++
++ spin_lock_irq(&ohci->lock);
++ disable (ohci);
++
++ /* Recycle any "live" eds/tds (and urbs). */
++ if (!list_empty (&ohci->pending))
++ ohci_dbg(ohci, "abort schedule...\n");
++ list_for_each_entry (priv, &ohci->pending, pending) {
++ struct urb *urb = priv->td[0]->urb;
++ struct ed *ed = priv->ed;
++
++ switch (ed->state) {
++ case ED_OPER:
++ ed->state = ED_UNLINK;
++ ed->hwINFO |= cpu_to_hc32(ohci, ED_DEQUEUE);
++ ed_deschedule (ohci, ed);
++
++ ed->ed_next = ohci->ed_rm_list;
++ ed->ed_prev = NULL;
++ ohci->ed_rm_list = ed;
++ /* FALLTHROUGH */
++ case ED_UNLINK:
++ break;
++ default:
++ ohci_dbg(ohci, "bogus ed %p state %d\n",
++ ed, ed->state);
++ }
++
++ if (!urb->unlinked)
++ urb->unlinked = -ESHUTDOWN;
++ }
++ finish_unlinks (ohci, 0);
++ spin_unlock_irq(&ohci->lock);
++
++ /* paranoia, in case that didn't work: */
++
++ /* empty the interrupt branches */
++ for (i = 0; i < NUM_INTS; i++) ohci->load [i] = 0;
++ for (i = 0; i < NUM_INTS; i++) ohci->hcca->int_table [i] = 0;
++
++ /* no EDs to remove */
++ ohci->ed_rm_list = NULL;
++
++ /* empty control and bulk lists */
++ ohci->ed_controltail = NULL;
++ ohci->ed_bulktail = NULL;
++
++ if ((temp = ohci_run (ohci)) < 0) {
++ ohci_err (ohci, "can't restart, %d\n", temp);
++ return temp;
++ }
++ ohci_dbg(ohci, "restart complete\n");
++ return 0;
++}
++
++#endif
++
++/*-------------------------------------------------------------------------*/
++
++MODULE_AUTHOR (DRIVER_AUTHOR);
++MODULE_DESCRIPTION(DRIVER_DESC);
++MODULE_LICENSE ("GPL");
++
++#ifdef CONFIG_PCI
++#include "ohci-pci.c"
++#define PCI_DRIVER ohci_pci_driver
++#endif
++
++#if defined(CONFIG_ARCH_SA1100) && defined(CONFIG_SA1111)
++#include "ohci-sa1111.c"
++#define SA1111_DRIVER ohci_hcd_sa1111_driver
++#endif
++
++#if defined(CONFIG_ARCH_S3C2410) || defined(CONFIG_ARCH_S3C64XX)
++#include "ohci-s3c2410.c"
++#define PLATFORM_DRIVER ohci_hcd_s3c2410_driver
++#endif
++
++#ifdef CONFIG_USB_OHCI_HCD_OMAP1
++#include "ohci-omap.c"
++#define OMAP1_PLATFORM_DRIVER ohci_hcd_omap_driver
++#endif
++
++#ifdef CONFIG_USB_OHCI_HCD_OMAP3
++#include "ohci-omap3.c"
++#define OMAP3_PLATFORM_DRIVER ohci_hcd_omap3_driver
++#endif
++
++#ifdef CONFIG_ARCH_LH7A404
++#include "ohci-lh7a404.c"
++#define PLATFORM_DRIVER ohci_hcd_lh7a404_driver
++#endif
++
++#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)
++#include "ohci-pxa27x.c"
++#define PLATFORM_DRIVER ohci_hcd_pxa27x_driver
++#endif
++
++#ifdef CONFIG_ARCH_EP93XX
++#include "ohci-ep93xx.c"
++#define PLATFORM_DRIVER ohci_hcd_ep93xx_driver
++#endif
++
++#ifdef CONFIG_SOC_AU1X00
++#include "ohci-au1xxx.c"
++#define PLATFORM_DRIVER ohci_hcd_au1xxx_driver
++#endif
++
++#ifdef CONFIG_PNX8550
++#include "ohci-pnx8550.c"
++#define PLATFORM_DRIVER ohci_hcd_pnx8550_driver
++#endif
++
++#ifdef CONFIG_USB_OHCI_HCD_PPC_SOC
++#include "ohci-ppc-soc.c"
++#define PLATFORM_DRIVER ohci_hcd_ppc_soc_driver
++#endif
++
++#ifdef CONFIG_ARCH_AT91
++#include "ohci-at91.c"
++#define PLATFORM_DRIVER ohci_hcd_at91_driver
++#endif
++
++#ifdef CONFIG_ARCH_PNX4008
++#include "ohci-pnx4008.c"
++#define PLATFORM_DRIVER usb_hcd_pnx4008_driver
++#endif
++
++#ifdef CONFIG_ARCH_DAVINCI_DA8XX
++#include "ohci-da8xx.c"
++#define PLATFORM_DRIVER ohci_hcd_da8xx_driver
++#endif
++
++#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
++ defined(CONFIG_CPU_SUBTYPE_SH7721) || \
++ defined(CONFIG_CPU_SUBTYPE_SH7763) || \
++ defined(CONFIG_CPU_SUBTYPE_SH7786)
++#include "ohci-sh.c"
++#define PLATFORM_DRIVER ohci_hcd_sh_driver
++#endif
++
++
++#ifdef CONFIG_USB_OHCI_HCD_PPC_OF
++#include "ohci-ppc-of.c"
++#define OF_PLATFORM_DRIVER ohci_hcd_ppc_of_driver
++#endif
++
++#ifdef CONFIG_PPC_PS3
++#include "ohci-ps3.c"
++#define PS3_SYSTEM_BUS_DRIVER ps3_ohci_driver
++#endif
++
++#ifdef CONFIG_USB_OHCI_HCD_SSB
++#include "ohci-ssb.c"
++#define SSB_OHCI_DRIVER ssb_ohci_driver
++#endif
++
++#ifdef CONFIG_MFD_SM501
++#include "ohci-sm501.c"
++#define SM501_OHCI_DRIVER ohci_hcd_sm501_driver
++#endif
++
++#ifdef CONFIG_MFD_TC6393XB
++#include "ohci-tmio.c"
++#define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver
++#endif
++
++#if !defined(PCI_DRIVER) && \
++ !defined(PLATFORM_DRIVER) && \
++ !defined(OMAP1_PLATFORM_DRIVER) && \
++ !defined(OMAP3_PLATFORM_DRIVER) && \
++ !defined(OF_PLATFORM_DRIVER) && \
++ !defined(SA1111_DRIVER) && \
++ !defined(PS3_SYSTEM_BUS_DRIVER) && \
++ !defined(SM501_OHCI_DRIVER) && \
++ !defined(TMIO_OHCI_DRIVER) && \
++ !defined(SSB_OHCI_DRIVER)
++#error "missing bus glue for ohci-hcd"
++#endif
++
++static int __init ohci_hcd_mod_init(void)
++{
++ int retval = 0;
++
++ if (usb_disabled())
++ return -ENODEV;
++
++ printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name);
++ pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name,
++ sizeof (struct ed), sizeof (struct td));
++ set_bit(USB_OHCI_LOADED, &usb_hcds_loaded);
++
++#ifdef DEBUG
++ ohci_debug_root = debugfs_create_dir("ohci", usb_debug_root);
++ if (!ohci_debug_root) {
++ retval = -ENOENT;
++ goto error_debug;
++ }
++#endif
++
++#ifdef PS3_SYSTEM_BUS_DRIVER
++ retval = ps3_ohci_driver_register(&PS3_SYSTEM_BUS_DRIVER);
++ if (retval < 0)
++ goto error_ps3;
++#endif
++
++#ifdef PLATFORM_DRIVER
++ retval = platform_driver_register(&PLATFORM_DRIVER);
++ if (retval < 0)
++ goto error_platform;
++#endif
++
++#ifdef OMAP1_PLATFORM_DRIVER
++ retval = platform_driver_register(&OMAP1_PLATFORM_DRIVER);
++ if (retval < 0)
++ goto error_omap1_platform;
++#endif
++
++#ifdef OMAP3_PLATFORM_DRIVER
++ retval = platform_driver_register(&OMAP3_PLATFORM_DRIVER);
++ if (retval < 0)
++ goto error_omap3_platform;
++#endif
++
++#ifdef OF_PLATFORM_DRIVER
++ retval = of_register_platform_driver(&OF_PLATFORM_DRIVER);
++ if (retval < 0)
++ goto error_of_platform;
++#endif
++
++#ifdef SA1111_DRIVER
++ retval = sa1111_driver_register(&SA1111_DRIVER);
++ if (retval < 0)
++ goto error_sa1111;
++#endif
++
++#ifdef PCI_DRIVER
++ retval = pci_register_driver(&PCI_DRIVER);
++ if (retval < 0)
++ goto error_pci;
++#endif
++
++#ifdef SSB_OHCI_DRIVER
++ retval = ssb_driver_register(&SSB_OHCI_DRIVER);
++ if (retval)
++ goto error_ssb;
++#endif
++
++#ifdef SM501_OHCI_DRIVER
++ retval = platform_driver_register(&SM501_OHCI_DRIVER);
++ if (retval < 0)
++ goto error_sm501;
++#endif
++
++#ifdef TMIO_OHCI_DRIVER
++ retval = platform_driver_register(&TMIO_OHCI_DRIVER);
++ if (retval < 0)
++ goto error_tmio;
++#endif
++
++ return retval;
++
++ /* Error path */
++#ifdef TMIO_OHCI_DRIVER
++ platform_driver_unregister(&TMIO_OHCI_DRIVER);
++ error_tmio:
++#endif
++#ifdef SM501_OHCI_DRIVER
++ platform_driver_unregister(&SM501_OHCI_DRIVER);
++ error_sm501:
++#endif
++#ifdef SSB_OHCI_DRIVER
++ ssb_driver_unregister(&SSB_OHCI_DRIVER);
++ error_ssb:
++#endif
++#ifdef PCI_DRIVER
++ pci_unregister_driver(&PCI_DRIVER);
++ error_pci:
++#endif
++#ifdef SA1111_DRIVER
++ sa1111_driver_unregister(&SA1111_DRIVER);
++ error_sa1111:
++#endif
++#ifdef OF_PLATFORM_DRIVER
++ of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
++ error_of_platform:
++#endif
++#ifdef PLATFORM_DRIVER
++ platform_driver_unregister(&PLATFORM_DRIVER);
++ error_platform:
++#endif
++#ifdef OMAP1_PLATFORM_DRIVER
++ platform_driver_unregister(&OMAP1_PLATFORM_DRIVER);
++ error_omap1_platform:
++#endif
++#ifdef OMAP3_PLATFORM_DRIVER
++ platform_driver_unregister(&OMAP3_PLATFORM_DRIVER);
++ error_omap3_platform:
++#endif
++#ifdef PS3_SYSTEM_BUS_DRIVER
++ ps3_ohci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
++ error_ps3:
++#endif
++#ifdef DEBUG
++ debugfs_remove(ohci_debug_root);
++ ohci_debug_root = NULL;
++ error_debug:
++#endif
++
++ clear_bit(USB_OHCI_LOADED, &usb_hcds_loaded);
++ return retval;
++}
++module_init(ohci_hcd_mod_init);
++
++static void __exit ohci_hcd_mod_exit(void)
++{
++#ifdef TMIO_OHCI_DRIVER
++ platform_driver_unregister(&TMIO_OHCI_DRIVER);
++#endif
++#ifdef SM501_OHCI_DRIVER
++ platform_driver_unregister(&SM501_OHCI_DRIVER);
++#endif
++#ifdef SSB_OHCI_DRIVER
++ ssb_driver_unregister(&SSB_OHCI_DRIVER);
++#endif
++#ifdef PCI_DRIVER
++ pci_unregister_driver(&PCI_DRIVER);
++#endif
++#ifdef SA1111_DRIVER
++ sa1111_driver_unregister(&SA1111_DRIVER);
++#endif
++#ifdef OF_PLATFORM_DRIVER
++ of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
++#endif
++#ifdef PLATFORM_DRIVER
++ platform_driver_unregister(&PLATFORM_DRIVER);
++#endif
++#ifdef PS3_SYSTEM_BUS_DRIVER
++ ps3_ohci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
++#endif
++#ifdef DEBUG
++ debugfs_remove(ohci_debug_root);
++#endif
++ clear_bit(USB_OHCI_LOADED, &usb_hcds_loaded);
++}
++module_exit(ohci_hcd_mod_exit);
++
+diff -Nur linux-2.6.35.7.orig/drivers/watchdog/ar71xx_wdt.c linux-2.6.35.7/drivers/watchdog/ar71xx_wdt.c
+--- linux-2.6.35.7.orig/drivers/watchdog/ar71xx_wdt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/watchdog/ar71xx_wdt.c 2010-10-14 20:28:01.508101380 +0200
@@ -0,0 +1,270 @@
+/*
+ * Driver for the Atheros AR71xx SoC's built-in hardware watchdog timer.
@@ -17283,10 +28690,10 @@ diff -Nur linux-2.6.34.orig/drivers/watchdog/ar71xx_wdt.c linux-2.6.34/drivers/w
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-diff -Nur linux-2.6.34.orig/drivers/watchdog/Kconfig linux-2.6.34/drivers/watchdog/Kconfig
---- linux-2.6.34.orig/drivers/watchdog/Kconfig 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/watchdog/Kconfig 2010-05-25 18:46:13.203464018 +0200
-@@ -857,6 +857,13 @@
+diff -Nur linux-2.6.35.7.orig/drivers/watchdog/Kconfig linux-2.6.35.7/drivers/watchdog/Kconfig
+--- linux-2.6.35.7.orig/drivers/watchdog/Kconfig 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/watchdog/Kconfig 2010-10-14 20:28:01.548101099 +0200
+@@ -875,6 +875,13 @@
help
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
@@ -17300,10 +28707,1128 @@ diff -Nur linux-2.6.34.orig/drivers/watchdog/Kconfig linux-2.6.34/drivers/watchd
# PARISC Architecture
# POWERPC Architecture
-diff -Nur linux-2.6.34.orig/drivers/watchdog/Makefile linux-2.6.34/drivers/watchdog/Makefile
---- linux-2.6.34.orig/drivers/watchdog/Makefile 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/watchdog/Makefile 2010-05-25 18:46:13.242223206 +0200
-@@ -113,6 +113,7 @@
+diff -Nur linux-2.6.35.7.orig/drivers/watchdog/Kconfig.orig linux-2.6.35.7/drivers/watchdog/Kconfig.orig
+--- linux-2.6.35.7.orig/drivers/watchdog/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/watchdog/Kconfig.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,1114 @@
++#
++# Watchdog device configuration
++#
++
++menuconfig WATCHDOG
++ bool "Watchdog Timer Support"
++ ---help---
++ If you say Y here (and to one of the following options) and create a
++ character special file /dev/watchdog with major number 10 and minor
++ number 130 using mknod ("man mknod"), you will get a watchdog, i.e.:
++ subsequently opening the file and then failing to write to it for
++ longer than 1 minute will result in rebooting the machine. This
++ could be useful for a networked machine that needs to come back
++ on-line as fast as possible after a lock-up. There's both a watchdog
++ implementation entirely in software (which can sometimes fail to
++ reboot the machine) and a driver for hardware watchdog boards, which
++ are more robust and can also keep track of the temperature inside
++ your computer. For details, read
++ <file:Documentation/watchdog/watchdog-api.txt> in the kernel source.
++
++ The watchdog is usually used together with the watchdog daemon
++ which is available from
++ <ftp://ibiblio.org/pub/Linux/system/daemons/watchdog/>. This daemon can
++ also monitor NFS connections and can reboot the machine when the process
++ table is full.
++
++ If unsure, say N.
++
++if WATCHDOG
++
++config WATCHDOG_NOWAYOUT
++ bool "Disable watchdog shutdown on close"
++ help
++ The default watchdog behaviour (which you get if you say N here) is
++ to stop the timer if the process managing it closes the file
++ /dev/watchdog. It's always remotely possible that this process might
++ get killed. If you say Y here, the watchdog cannot be stopped once
++ it has been started.
++
++#
++# General Watchdog drivers
++#
++
++comment "Watchdog Device Drivers"
++
++# Architecture Independent
++
++config SOFT_WATCHDOG
++ tristate "Software watchdog"
++ help
++ A software monitoring watchdog. This will fail to reboot your system
++ from some situations that the hardware watchdog will recover
++ from. Equally it's a lot cheaper to install.
++
++ To compile this driver as a module, choose M here: the
++ module will be called softdog.
++
++config WM831X_WATCHDOG
++ tristate "WM831x watchdog"
++ depends on MFD_WM831X
++ help
++ Support for the watchdog in the WM831x AudioPlus PMICs. When
++ the watchdog triggers the system will be reset.
++
++config WM8350_WATCHDOG
++ tristate "WM8350 watchdog"
++ depends on MFD_WM8350
++ help
++ Support for the watchdog in the WM8350 AudioPlus PMIC. When
++ the watchdog triggers the system will be reset.
++
++# ALPHA Architecture
++
++# ARM Architecture
++
++config AT91RM9200_WATCHDOG
++ tristate "AT91RM9200 watchdog"
++ depends on ARCH_AT91RM9200
++ help
++ Watchdog timer embedded into AT91RM9200 chips. This will reboot your
++ system when the timeout is reached.
++
++config AT91SAM9X_WATCHDOG
++ tristate "AT91SAM9X / AT91CAP9 watchdog"
++ depends on ARCH_AT91 && !ARCH_AT91RM9200
++ help
++ Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
++ reboot your system when the timeout is reached.
++
++config 21285_WATCHDOG
++ tristate "DC21285 watchdog"
++ depends on FOOTBRIDGE
++ help
++ The Intel Footbridge chip contains a built-in watchdog circuit. Say Y
++ here if you wish to use this. Alternatively say M to compile the
++ driver as a module, which will be called wdt285.
++
++ This driver does not work on all machines. In particular, early CATS
++ boards have hardware problems that will cause the machine to simply
++ lock up if the watchdog fires.
++
++ "If in doubt, leave it out" - say N.
++
++config 977_WATCHDOG
++ tristate "NetWinder WB83C977 watchdog"
++ depends on FOOTBRIDGE && ARCH_NETWINDER
++ help
++ Say Y here to include support for the WB977 watchdog included in
++ NetWinder machines. Alternatively say M to compile the driver as
++ a module, which will be called wdt977.
++
++ Not sure? It's safe to say N.
++
++config IXP2000_WATCHDOG
++ tristate "IXP2000 Watchdog"
++ depends on ARCH_IXP2000
++ help
++ Say Y here if to include support for the watchdog timer
++ in the Intel IXP2000(2400, 2800, 2850) network processors.
++ This driver can be built as a module by choosing M. The module
++ will be called ixp2000_wdt.
++
++ Say N if you are unsure.
++
++config IXP4XX_WATCHDOG
++ tristate "IXP4xx Watchdog"
++ depends on ARCH_IXP4XX
++ help
++ Say Y here if to include support for the watchdog timer
++ in the Intel IXP4xx network processors. This driver can
++ be built as a module by choosing M. The module will
++ be called ixp4xx_wdt.
++
++ Note: The internal IXP4xx watchdog does a soft CPU reset
++ which doesn't reset any peripherals. There are circumstances
++ where the watchdog will fail to reset the board correctly
++ (e.g., if the boot ROM is in an unreadable state).
++
++ Say N if you are unsure.
++
++config KS8695_WATCHDOG
++ tristate "KS8695 watchdog"
++ depends on ARCH_KS8695
++ help
++ Watchdog timer embedded into KS8695 processor. This will reboot your
++ system when the timeout is reached.
++
++config HAVE_S3C2410_WATCHDOG
++ bool
++ help
++ This will include watchdog timer support for Samsung SoCs. If
++ you want to include watchdog support for any machine, kindly
++ select this in the respective mach-XXXX/Kconfig file.
++
++config S3C2410_WATCHDOG
++ tristate "S3C2410 Watchdog"
++ depends on ARCH_S3C2410 || HAVE_S3C2410_WATCHDOG
++ help
++ Watchdog timer block in the Samsung SoCs. This will reboot
++ the system when the timer expires with the watchdog enabled.
++
++ The driver is limited by the speed of the system's PCLK
++ signal, so with reasonably fast systems (PCLK around 50-66MHz)
++ then watchdog intervals of over approximately 20seconds are
++ unavailable.
++
++ The driver can be built as a module by choosing M, and will
++ be called s3c2410_wdt
++
++config SA1100_WATCHDOG
++ tristate "SA1100/PXA2xx watchdog"
++ depends on ARCH_SA1100 || ARCH_PXA
++ help
++ Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
++ reboot your system when timeout is reached.
++
++ NOTE: once enabled, this timer cannot be disabled.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sa1100_wdt.
++
++config MPCORE_WATCHDOG
++ tristate "MPcore watchdog"
++ depends on HAVE_ARM_TWD
++ help
++ Watchdog timer embedded into the MPcore system.
++
++ To compile this driver as a module, choose M here: the
++ module will be called mpcore_wdt.
++
++config EP93XX_WATCHDOG
++ tristate "EP93xx Watchdog"
++ depends on ARCH_EP93XX
++ help
++ Say Y here if to include support for the watchdog timer
++ embedded in the Cirrus Logic EP93xx family of devices.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ep93xx_wdt.
++
++config OMAP_WATCHDOG
++ tristate "OMAP Watchdog"
++ depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS
++ help
++ Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog. Say 'Y'
++ here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog timer.
++
++config PNX4008_WATCHDOG
++ tristate "PNX4008 Watchdog"
++ depends on ARCH_PNX4008
++ help
++ Say Y here if to include support for the watchdog timer
++ in the PNX4008 processor.
++ This driver can be built as a module by choosing M. The module
++ will be called pnx4008_wdt.
++
++ Say N if you are unsure.
++
++config IOP_WATCHDOG
++ tristate "IOP Watchdog"
++ depends on PLAT_IOP
++ select WATCHDOG_NOWAYOUT if (ARCH_IOP32X || ARCH_IOP33X)
++ help
++ Say Y here if to include support for the watchdog timer
++ in the Intel IOP3XX & IOP13XX I/O Processors. This driver can
++ be built as a module by choosing M. The module will
++ be called iop_wdt.
++
++ Note: The IOP13XX watchdog does an Internal Bus Reset which will
++ affect both cores and the peripherals of the IOP. The ATU-X
++ and/or ATUe configuration registers will remain intact, but if
++ operating as an Root Complex and/or Central Resource, the PCI-X
++ and/or PCIe busses will also be reset. THIS IS A VERY BIG HAMMER.
++
++config DAVINCI_WATCHDOG
++ tristate "DaVinci watchdog"
++ depends on ARCH_DAVINCI
++ help
++ Say Y here if to include support for the watchdog timer
++ in the DaVinci DM644x/DM646x processors.
++ To compile this driver as a module, choose M here: the
++ module will be called davinci_wdt.
++
++ NOTE: once enabled, this timer cannot be disabled.
++ Say N if you are unsure.
++
++config ORION_WATCHDOG
++ tristate "Orion watchdog"
++ depends on ARCH_ORION5X || ARCH_KIRKWOOD
++ help
++ Say Y here if to include support for the watchdog timer
++ in the Marvell Orion5x and Kirkwood ARM SoCs.
++ To compile this driver as a module, choose M here: the
++ module will be called orion_wdt.
++
++config COH901327_WATCHDOG
++ bool "ST-Ericsson COH 901 327 watchdog"
++ depends on ARCH_U300
++ default y if MACH_U300
++ help
++ Say Y here to include Watchdog timer support for the
++ watchdog embedded into the ST-Ericsson U300 series platforms.
++ This watchdog is used to reset the system and thus cannot be
++ compiled as a module.
++
++config TWL4030_WATCHDOG
++ tristate "TWL4030 Watchdog"
++ depends on TWL4030_CORE
++ help
++ Support for TI TWL4030 watchdog. Say 'Y' here to enable the
++ watchdog timer support for TWL4030 chips.
++
++config STMP3XXX_WATCHDOG
++ tristate "Freescale STMP3XXX watchdog"
++ depends on ARCH_STMP3XXX
++ help
++ Say Y here if to include support for the watchdog timer
++ for the Sigmatel STMP37XX/378X SoC.
++ To compile this driver as a module, choose M here: the
++ module will be called stmp3xxx_wdt.
++
++config NUC900_WATCHDOG
++ tristate "Nuvoton NUC900 watchdog"
++ depends on ARCH_W90X900
++ help
++ Say Y here if to include support for the watchdog timer
++ for the Nuvoton NUC900 series SoCs.
++ To compile this driver as a module, choose M here: the
++ module will be called nuc900_wdt.
++
++config ADX_WATCHDOG
++ tristate "Avionic Design Xanthos watchdog"
++ depends on ARCH_PXA_ADX
++ help
++ Say Y here if you want support for the watchdog timer on Avionic
++ Design Xanthos boards.
++
++config TS72XX_WATCHDOG
++ tristate "TS-72XX SBC Watchdog"
++ depends on MACH_TS72XX
++ help
++ Technologic Systems TS-7200, TS-7250 and TS-7260 boards have
++ watchdog timer implemented in a external CPLD chip. Say Y here
++ if you want to support for the watchdog timer on TS-72XX boards.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ts72xx_wdt.
++
++config MAX63XX_WATCHDOG
++ tristate "Max63xx watchdog"
++ depends on ARM && HAS_IOMEM
++ help
++ Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.
++
++config IMX2_WDT
++ tristate "IMX2+ Watchdog"
++ depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX5
++ help
++ This is the driver for the hardware watchdog
++ on the Freescale IMX2 and later processors.
++ If you have one of these processors and wish to have
++ watchdog support enabled, say Y, otherwise say N.
++
++ To compile this driver as a module, choose M here: the
++ module will be called imx2_wdt.
++
++# AVR32 Architecture
++
++config AT32AP700X_WDT
++ tristate "AT32AP700x watchdog"
++ depends on CPU_AT32AP700X
++ help
++ Watchdog timer embedded into AT32AP700x devices. This will reboot
++ your system when the timeout is reached.
++
++# BLACKFIN Architecture
++
++config BFIN_WDT
++ tristate "Blackfin On-Chip Watchdog Timer"
++ depends on BLACKFIN
++ ---help---
++ If you say yes here you will get support for the Blackfin On-Chip
++ Watchdog Timer. If you have one of these processors and wish to
++ have watchdog support enabled, say Y, otherwise say N.
++
++ To compile this driver as a module, choose M here: the
++ module will be called bfin_wdt.
++
++# CRIS Architecture
++
++# FRV Architecture
++
++# H8300 Architecture
++
++# X86 (i386 + ia64 + x86_64) Architecture
++
++config ACQUIRE_WDT
++ tristate "Acquire SBC Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog on Single Board
++ Computers produced by Acquire Inc (and others). This watchdog
++ simply watches your kernel to make sure it doesn't freeze, and if
++ it does, it reboots your computer after a certain amount of time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called acquirewdt.
++
++ Most people will say N.
++
++config ADVANTECH_WDT
++ tristate "Advantech SBC Watchdog Timer"
++ depends on X86
++ help
++ If you are configuring a Linux kernel for the Advantech single-board
++ computer, say `Y' here to support its built-in watchdog timer
++ feature. More information can be found at
++ <http://www.advantech.com.tw/products/>
++
++config ALIM1535_WDT
++ tristate "ALi M1535 PMU Watchdog Timer"
++ depends on X86 && PCI
++ ---help---
++ This is the driver for the hardware watchdog on the ALi M1535 PMU.
++
++ To compile this driver as a module, choose M here: the
++ module will be called alim1535_wdt.
++
++ Most people will say N.
++
++config ALIM7101_WDT
++ tristate "ALi M7101 PMU Computer Watchdog"
++ depends on PCI
++ help
++ This is the driver for the hardware watchdog on the ALi M7101 PMU
++ as used in the x86 Cobalt servers and also found in some
++ SPARC Netra servers too.
++
++ To compile this driver as a module, choose M here: the
++ module will be called alim7101_wdt.
++
++ Most people will say N.
++
++config GEODE_WDT
++ tristate "AMD Geode CS5535/CS5536 Watchdog"
++ depends on CS5535_MFGPT
++ help
++ This driver enables a watchdog capability built into the
++ CS5535/CS5536 companion chips for the AMD Geode GX and LX
++ processors. This watchdog watches your kernel to make sure
++ it doesn't freeze, and if it does, it reboots your computer after
++ a certain amount of time.
++
++ You can compile this driver directly into the kernel, or use
++ it as a module. The module will be called geodewdt.
++
++config SC520_WDT
++ tristate "AMD Elan SC520 processor Watchdog"
++ depends on X86
++ help
++ This is the driver for the hardware watchdog built in to the
++ AMD "Elan" SC520 microcomputer commonly used in embedded systems.
++ This watchdog simply watches your kernel to make sure it doesn't
++ freeze, and if it does, it reboots your computer after a certain
++ amount of time.
++
++ You can compile this driver directly into the kernel, or use
++ it as a module. The module will be called sc520_wdt.
++
++config SBC_FITPC2_WATCHDOG
++ tristate "Compulab SBC-FITPC2 watchdog"
++ depends on X86
++ ---help---
++ This is the driver for the built-in watchdog timer on the fit-PC2,
++ fit-PC2i, CM-iAM single-board computers made by Compulab.
++
++ It`s possible to enable watchdog timer either from BIOS (F2) or from booted Linux.
++ When "Watchdog Timer Value" enabled one can set 31-255 s operational range.
++
++ Entering BIOS setup temporary disables watchdog operation regardless to current state,
++ so system will not be restarted while user in BIOS setup.
++
++ Once watchdog was enabled the system will be restarted every
++ "Watchdog Timer Value" period, so to prevent it user can restart or
++ disable the watchdog.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sbc_fitpc2_wdt.
++
++ Most people will say N.
++
++config EUROTECH_WDT
++ tristate "Eurotech CPU-1220/1410 Watchdog Timer"
++ depends on X86
++ help
++ Enable support for the watchdog timer on the Eurotech CPU-1220 and
++ CPU-1410 cards. These are PC/104 SBCs. Spec sheets and product
++ information are at <http://www.eurotech.it/>.
++
++config IB700_WDT
++ tristate "IB700 SBC Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog on the IB700 Single
++ Board Computer produced by TMC Technology (www.tmc-uk.com). This watchdog
++ simply watches your kernel to make sure it doesn't freeze, and if
++ it does, it reboots your computer after a certain amount of time.
++
++ This driver is like the WDT501 driver but for slightly different hardware.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ib700wdt.
++
++ Most people will say N.
++
++config IBMASR
++ tristate "IBM Automatic Server Restart"
++ depends on X86
++ help
++ This is the driver for the IBM Automatic Server Restart watchdog
++ timer built-in into some eServer xSeries machines.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ibmasr.
++
++config WAFER_WDT
++ tristate "ICP Single Board Computer Watchdog Timer"
++ depends on X86
++ help
++ This is a driver for the hardware watchdog on the ICP Single
++ Board Computer. This driver is working on (at least) the following
++ IPC SBC's: Wafer 5823, Rocky 4783, Rocky 3703 and Rocky 3782.
++
++ To compile this driver as a module, choose M here: the
++ module will be called wafer5823wdt.
++
++config I6300ESB_WDT
++ tristate "Intel 6300ESB Timer/Watchdog"
++ depends on X86 && PCI
++ ---help---
++ Hardware driver for the watchdog timer built into the Intel
++ 6300ESB controller hub.
++
++ To compile this driver as a module, choose M here: the
++ module will be called i6300esb.
++
++config ITCO_WDT
++ tristate "Intel TCO Timer/Watchdog"
++ depends on (X86 || IA64) && PCI
++ ---help---
++ Hardware driver for the intel TCO timer based watchdog devices.
++ These drivers are included in the Intel 82801 I/O Controller
++ Hub family (from ICH0 up to ICH10) and in the Intel 63xxESB
++ controller hub.
++
++ The TCO (Total Cost of Ownership) timer is a watchdog timer
++ that will reboot the machine after its second expiration. The
++ expiration time can be configured with the "heartbeat" parameter.
++
++ On some motherboards the driver may fail to reset the chipset's
++ NO_REBOOT flag which prevents the watchdog from rebooting the
++ machine. If this is the case you will get a kernel message like
++ "failed to reset NO_REBOOT flag, reboot disabled by hardware".
++
++ To compile this driver as a module, choose M here: the
++ module will be called iTCO_wdt.
++
++config ITCO_VENDOR_SUPPORT
++ bool "Intel TCO Timer/Watchdog Specific Vendor Support"
++ depends on ITCO_WDT
++ ---help---
++ Add vendor specific support to the intel TCO timer based watchdog
++ devices. At this moment we only have additional support for some
++ SuperMicro Inc. motherboards.
++
++config IT8712F_WDT
++ tristate "IT8712F (Smart Guardian) Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the built-in watchdog timer on the IT8712F
++ Super I/0 chipset used on many motherboards.
++
++ To compile this driver as a module, choose M here: the
++ module will be called it8712f_wdt.
++
++config IT87_WDT
++ tristate "IT87 Watchdog Timer"
++ depends on X86 && EXPERIMENTAL
++ ---help---
++ This is the driver for the hardware watchdog on the ITE IT8716,
++ IT8718, IT8726, IT8712(Version J,K) Super I/O chips. This watchdog
++ simply watches your kernel to make sure it doesn't freeze, and if
++ it does, it reboots your computer after a certain amount of time.
++
++ To compile this driver as a module, choose M here: the module will
++ be called it87_wdt.
++
++config HP_WATCHDOG
++ tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
++ depends on X86
++ help
++ A software monitoring watchdog and NMI sourcing driver. This driver
++ will detect lockups and provide stack trace. Also, when an NMI
++ occurs this driver will make the necessary BIOS calls to log
++ the cause of the NMI. This is a driver that will only load on a
++ HP ProLiant system with a minimum of iLO2 support.
++ To compile this driver as a module, choose M here: the
++ module will be called hpwdt.
++
++config SC1200_WDT
++ tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
++ depends on X86
++ help
++ This is a driver for National Semiconductor PC87307/PC97307 hardware
++ watchdog cards as found on the SC1200. This watchdog is mainly used
++ for power management purposes and can be used to power down the device
++ during inactivity periods (includes interrupt activity monitoring).
++
++ To compile this driver as a module, choose M here: the
++ module will be called sc1200wdt.
++
++ Most people will say N.
++
++config SCx200_WDT
++ tristate "National Semiconductor SCx200 Watchdog"
++ depends on SCx200 && PCI
++ help
++ Enable the built-in watchdog timer support on the National
++ Semiconductor SCx200 processors.
++
++ If compiled as a module, it will be called scx200_wdt.
++
++config PC87413_WDT
++ tristate "NS PC87413 watchdog"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog on the PC87413 chipset
++ This watchdog simply watches your kernel to make sure it doesn't
++ freeze, and if it does, it reboots your computer after a certain
++ amount of time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called pc87413_wdt.
++
++ Most people will say N.
++
++config RDC321X_WDT
++ tristate "RDC R-321x SoC watchdog"
++ depends on X86_RDC321X
++ help
++ This is the driver for the built in hardware watchdog
++ in the RDC R-321x SoC.
++
++ To compile this driver as a module, choose M here: the
++ module will be called rdc321x_wdt.
++
++config 60XX_WDT
++ tristate "SBC-60XX Watchdog Timer"
++ depends on X86
++ help
++ This driver can be used with the watchdog timer found on some
++ single board computers, namely the 6010 PII based computer.
++ It may well work with other cards. It reads port 0x443 to enable
++ and re-set the watchdog timer, and reads port 0x45 to disable
++ the watchdog. If you have a card that behave in similar ways,
++ you can probably make this driver work with your card as well.
++
++ You can compile this driver directly into the kernel, or use
++ it as a module. The module will be called sbc60xxwdt.
++
++config SBC8360_WDT
++ tristate "SBC8360 Watchdog Timer"
++ depends on X86
++ ---help---
++
++ This is the driver for the hardware watchdog on the SBC8360 Single
++ Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com).
++
++ To compile this driver as a module, choose M here: the
++ module will be called sbc8360.
++
++ Most people will say N.
++
++config SBC7240_WDT
++ tristate "SBC Nano 7240 Watchdog Timer"
++ depends on X86_32
++ ---help---
++ This is the driver for the hardware watchdog found on the IEI
++ single board computers EPIC Nano 7240 (and likely others). This
++ watchdog simply watches your kernel to make sure it doesn't freeze,
++ and if it does, it reboots your computer after a certain amount of
++ time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sbc7240_wdt.
++
++config CPU5_WDT
++ tristate "SMA CPU5 Watchdog"
++ depends on X86
++ ---help---
++ TBD.
++ To compile this driver as a module, choose M here: the
++ module will be called cpu5wdt.
++
++config SMSC_SCH311X_WDT
++ tristate "SMSC SCH311X Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog timer on the
++ SMSC SCH3112, SCH3114 and SCH3116 Super IO chipset
++ (LPC IO with 8042 KBC, Reset Generation, HWM and multiple
++ serial ports).
++
++ To compile this driver as a module, choose M here: the
++ module will be called sch311x_wdt.
++
++config SMSC37B787_WDT
++ tristate "Winbond SMsC37B787 Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog component on the
++ Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
++ from Vision Systems and maybe others.
++
++ This watchdog simply watches your kernel to make sure it doesn't
++ freeze, and if it does, it reboots your computer after a certain
++ amount of time.
++
++ Usually a userspace daemon will notify the kernel WDT driver that
++ userspace is still alive, at regular intervals.
++
++ To compile this driver as a module, choose M here: the
++ module will be called smsc37b787_wdt.
++
++ Most people will say N.
++
++config W83627HF_WDT
++ tristate "W83627HF Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog on the W83627HF chipset
++ as used in Advantech PC-9578 and Tyan S2721-533 motherboards
++ (and likely others). This watchdog simply watches your kernel to
++ make sure it doesn't freeze, and if it does, it reboots your computer
++ after a certain amount of time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called w83627hf_wdt.
++
++ Most people will say N.
++
++config W83697HF_WDT
++ tristate "W83697HF/W83697HG Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog on the W83697HF/HG
++ chipset as used in Dedibox/VIA motherboards (and likely others).
++ This watchdog simply watches your kernel to make sure it doesn't
++ freeze, and if it does, it reboots your computer after a certain
++ amount of time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called w83697hf_wdt.
++
++ Most people will say N.
++
++config W83697UG_WDT
++ tristate "W83697UG/W83697UF Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog on the W83697UG/UF
++ chipset as used in MSI Fuzzy CX700 VIA motherboards (and likely others).
++ This watchdog simply watches your kernel to make sure it doesn't
++ freeze, and if it does, it reboots your computer after a certain
++ amount of time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called w83697ug_wdt.
++
++ Most people will say N.
++
++config W83877F_WDT
++ tristate "W83877F (EMACS) Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog on the W83877F chipset
++ as used in EMACS PC-104 motherboards (and likely others). This
++ watchdog simply watches your kernel to make sure it doesn't freeze,
++ and if it does, it reboots your computer after a certain amount of
++ time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called w83877f_wdt.
++
++ Most people will say N.
++
++config W83977F_WDT
++ tristate "W83977F (PCM-5335) Watchdog Timer"
++ depends on X86
++ ---help---
++ This is the driver for the hardware watchdog on the W83977F I/O chip
++ as used in AAEON's PCM-5335 SBC (and likely others). This
++ watchdog simply watches your kernel to make sure it doesn't freeze,
++ and if it does, it reboots your computer after a certain amount of
++ time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called w83977f_wdt.
++
++config MACHZ_WDT
++ tristate "ZF MachZ Watchdog"
++ depends on X86
++ ---help---
++ If you are using a ZF Micro MachZ processor, say Y here, otherwise
++ N. This is the driver for the watchdog timer built-in on that
++ processor using ZF-Logic interface. This watchdog simply watches
++ your kernel to make sure it doesn't freeze, and if it does, it
++ reboots your computer after a certain amount of time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called machzwd.
++
++config SBC_EPX_C3_WATCHDOG
++ tristate "Winsystems SBC EPX-C3 watchdog"
++ depends on X86
++ ---help---
++ This is the driver for the built-in watchdog timer on the EPX-C3
++ Single-board computer made by Winsystems, Inc.
++
++ *Note*: This hardware watchdog is not probeable and thus there
++ is no way to know if writing to its IO address will corrupt
++ your system or have any real effect. The only way to be sure
++ that this driver does what you want is to make sure you
++ are running it on an EPX-C3 from Winsystems with the watchdog
++ timer at IO address 0x1ee and 0x1ef. It will write to both those
++ IO ports. Basically, the assumption is made that if you compile
++ this driver into your kernel and/or load it as a module, that you
++ know what you are doing and that you are in fact running on an
++ EPX-C3 board!
++
++ To compile this driver as a module, choose M here: the
++ module will be called sbc_epx_c3.
++
++# M32R Architecture
++
++# M68K Architecture
++
++# M68KNOMMU Architecture
++
++# MIPS Architecture
++
++config BCM47XX_WDT
++ tristate "Broadcom BCM47xx Watchdog Timer"
++ depends on BCM47XX
++ help
++ Hardware driver for the Broadcom BCM47xx Watchog Timer.
++
++config RC32434_WDT
++ tristate "IDT RC32434 SoC Watchdog Timer"
++ depends on MIKROTIK_RB532
++ help
++ Hardware driver for the IDT RC32434 SoC built-in
++ watchdog timer.
++
++ To compile this driver as a module, choose M here: the
++ module will be called rc32434_wdt.
++
++config INDYDOG
++ tristate "Indy/I2 Hardware Watchdog"
++ depends on SGI_HAS_INDYDOG
++ help
++ Hardware driver for the Indy's/I2's watchdog. This is a
++ watchdog timer that will reboot the machine after a 60 second
++ timer expired and no process has written to /dev/watchdog during
++ that time.
++
++config WDT_MTX1
++ tristate "MTX-1 Hardware Watchdog"
++ depends on MIPS_MTX1
++ help
++ Hardware driver for the MTX-1 boards. This is a watchdog timer that
++ will reboot the machine after a 100 seconds timer expired.
++
++config PNX833X_WDT
++ tristate "PNX833x Hardware Watchdog"
++ depends on SOC_PNX8335
++ help
++ Hardware driver for the PNX833x's watchdog. This is a
++ watchdog timer that will reboot the machine after a programable
++ timer has expired and no process has written to /dev/watchdog during
++ that time.
++
++config SIBYTE_WDOG
++ tristate "Sibyte SoC hardware watchdog"
++ depends on CPU_SB1
++ help
++ Watchdog driver for the built in watchdog hardware in Sibyte
++ SoC processors. There are apparently two watchdog timers
++ on such processors; this driver supports only the first one,
++ because currently Linux only supports exporting one watchdog
++ to userspace.
++
++ To compile this driver as a loadable module, choose M here.
++ The module will be called sb_wdog.
++
++config AR7_WDT
++ tristate "TI AR7 Watchdog Timer"
++ depends on AR7
++ help
++ Hardware driver for the TI AR7 Watchdog Timer.
++
++config TXX9_WDT
++ tristate "Toshiba TXx9 Watchdog Timer"
++ depends on CPU_TX39XX || CPU_TX49XX
++ help
++ Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
++
++# PARISC Architecture
++
++# POWERPC Architecture
++
++config GEF_WDT
++ tristate "GE Watchdog Timer"
++ depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
++ ---help---
++ Watchdog timer found in a number of GE single board computers.
++
++config MPC5200_WDT
++ bool "MPC52xx Watchdog Timer"
++ depends on PPC_MPC52xx
++ help
++ Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.
++
++config 8xxx_WDT
++ tristate "MPC8xxx Platform Watchdog Timer"
++ depends on PPC_8xx || PPC_83xx || PPC_86xx
++ help
++ This driver is for a SoC level watchdog that exists on some
++ Freescale PowerPC processors. So far this driver supports:
++ - MPC8xx watchdogs
++ - MPC83xx watchdogs
++ - MPC86xx watchdogs
++
++ For BookE processors (MPC85xx) use the BOOKE_WDT driver instead.
++
++config MV64X60_WDT
++ tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
++ depends on MV64X60
++
++config PIKA_WDT
++ tristate "PIKA FPGA Watchdog"
++ depends on WARP
++ default y
++ help
++ This enables the watchdog in the PIKA FPGA. Currently used on
++ the Warp platform.
++
++config BOOKE_WDT
++ bool "PowerPC Book-E Watchdog Timer"
++ depends on BOOKE || 4xx
++ ---help---
++ Please see Documentation/watchdog/watchdog-api.txt for
++ more information.
++
++# PPC64 Architecture
++
++config WATCHDOG_RTAS
++ tristate "RTAS watchdog"
++ depends on PPC_RTAS
++ help
++ This driver adds watchdog support for the RTAS watchdog.
++
++ To compile this driver as a module, choose M here. The module
++ will be called wdrtas.
++
++# S390 Architecture
++
++config ZVM_WATCHDOG
++ tristate "z/VM Watchdog Timer"
++ depends on S390
++ help
++ IBM s/390 and zSeries machines running under z/VM 5.1 or later
++ provide a virtual watchdog timer to their guest that cause a
++ user define Control Program command to be executed after a
++ timeout.
++
++ To compile this driver as a module, choose M here. The module
++ will be called vmwatchdog.
++
++# SUPERH (sh + sh64) Architecture
++
++config SH_WDT
++ tristate "SuperH Watchdog"
++ depends on SUPERH && (CPU_SH3 || CPU_SH4)
++ help
++ This driver adds watchdog support for the integrated watchdog in the
++ SuperH processors. If you have one of these processors and wish
++ to have watchdog support enabled, say Y, otherwise say N.
++
++ As a side note, saying Y here will automatically boost HZ to 1000
++ so that the timer has a chance to clear the overflow counter. On
++ slower systems (such as the SH-2 and SH-3) this will likely yield
++ some performance issues. As such, the WDT should be avoided here
++ unless it is absolutely necessary.
++
++ To compile this driver as a module, choose M here: the
++ module will be called shwdt.
++
++config SH_WDT_MMAP
++ bool "Allow mmap of SH WDT"
++ default n
++ depends on SH_WDT
++ help
++ If you say Y here, user applications will be able to mmap the
++ WDT/CPG registers.
++
++# SPARC Architecture
++
++# SPARC64 Architecture
++
++config WATCHDOG_CP1XXX
++ tristate "CP1XXX Hardware Watchdog support"
++ depends on SPARC64 && PCI
++ ---help---
++ This is the driver for the hardware watchdog timers present on
++ Sun Microsystems CompactPCI models CP1400 and CP1500.
++
++ To compile this driver as a module, choose M here: the
++ module will be called cpwatchdog.
++
++ If you do not have a CompactPCI model CP1400 or CP1500, or
++ another UltraSPARC-IIi-cEngine boardset with hardware watchdog,
++ you should say N to this option.
++
++config WATCHDOG_RIO
++ tristate "RIO Hardware Watchdog support"
++ depends on SPARC64 && PCI
++ help
++ Say Y here to support the hardware watchdog capability on Sun RIO
++ machines. The watchdog timeout period is normally one minute but
++ can be changed with a boot-time parameter.
++
++# XTENSA Architecture
++
++#
++# ISA-based Watchdog Cards
++#
++
++comment "ISA-based Watchdog Cards"
++ depends on ISA
++
++config PCWATCHDOG
++ tristate "Berkshire Products ISA-PC Watchdog"
++ depends on ISA
++ ---help---
++ This is the driver for the Berkshire Products ISA-PC Watchdog card.
++ This card simply watches your kernel to make sure it doesn't freeze,
++ and if it does, it reboots your computer after a certain amount of
++ time. This driver is like the WDT501 driver but for different
++ hardware. Please read <file:Documentation/watchdog/pcwd-watchdog.txt>. The PC
++ watchdog cards can be ordered from <http://www.berkprod.com/>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called pcwd.
++
++ Most people will say N.
++
++config MIXCOMWD
++ tristate "Mixcom Watchdog"
++ depends on ISA
++ ---help---
++ This is a driver for the Mixcom hardware watchdog cards. This
++ watchdog simply watches your kernel to make sure it doesn't freeze,
++ and if it does, it reboots your computer after a certain amount of
++ time.
++
++ To compile this driver as a module, choose M here: the
++ module will be called mixcomwd.
++
++ Most people will say N.
++
++config WDT
++ tristate "WDT Watchdog timer"
++ depends on ISA
++ ---help---
++ If you have a WDT500P or WDT501P watchdog board, say Y here,
++ otherwise N. It is not possible to probe for this board, which means
++ that you have to inform the kernel about the IO port and IRQ that
++ is needed (you can do this via the io and irq parameters)
++
++ To compile this driver as a module, choose M here: the
++ module will be called wdt.
++
++#
++# PCI-based Watchdog Cards
++#
++
++comment "PCI-based Watchdog Cards"
++ depends on PCI
++
++config PCIPCWATCHDOG
++ tristate "Berkshire Products PCI-PC Watchdog"
++ depends on PCI
++ ---help---
++ This is the driver for the Berkshire Products PCI-PC Watchdog card.
++ This card simply watches your kernel to make sure it doesn't freeze,
++ and if it does, it reboots your computer after a certain amount of
++ time. The card can also monitor the internal temperature of the PC.
++ More info is available at <http://www.berkprod.com/pci_pc_watchdog.htm>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called pcwd_pci.
++
++ Most people will say N.
++
++config WDTPCI
++ tristate "PCI-WDT500/501 Watchdog timer"
++ depends on PCI
++ ---help---
++ If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
++
++ If you have a PCI-WDT501 watchdog board then you can enable the
++ temperature sensor by setting the type parameter to 501.
++
++ If you want to enable the Fan Tachometer on the PCI-WDT501, then you
++ can do this via the tachometer parameter. Only do this if you have a
++ fan tachometer actually set up.
++
++ To compile this driver as a module, choose M here: the
++ module will be called wdt_pci.
++
++#
++# USB-based Watchdog Cards
++#
++
++comment "USB-based Watchdog Cards"
++ depends on USB
++
++config USBPCWATCHDOG
++ tristate "Berkshire Products USB-PC Watchdog"
++ depends on USB
++ ---help---
++ This is the driver for the Berkshire Products USB-PC Watchdog card.
++ This card simply watches your kernel to make sure it doesn't freeze,
++ and if it does, it reboots your computer after a certain amount of
++ time. The card can also monitor the internal temperature of the PC.
++ More info is available at <http://www.berkprod.com/usb_pc_watchdog.htm>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called pcwd_usb.
++
++ Most people will say N.
++
++endif # WATCHDOG
+diff -Nur linux-2.6.35.7.orig/drivers/watchdog/Makefile linux-2.6.35.7/drivers/watchdog/Makefile
+--- linux-2.6.35.7.orig/drivers/watchdog/Makefile 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/watchdog/Makefile 2010-10-14 20:28:01.588091787 +0200
+@@ -114,6 +114,7 @@
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
@@ -17311,9 +29836,161 @@ diff -Nur linux-2.6.34.orig/drivers/watchdog/Makefile linux-2.6.34/drivers/watch
# PARISC Architecture
-diff -Nur linux-2.6.34.orig/include/linux/ath9k_platform.h linux-2.6.34/include/linux/ath9k_platform.h
---- linux-2.6.34.orig/include/linux/ath9k_platform.h 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/include/linux/ath9k_platform.h 2010-05-25 18:46:13.283473018 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/watchdog/Makefile.orig linux-2.6.35.7/drivers/watchdog/Makefile.orig
+--- linux-2.6.35.7.orig/drivers/watchdog/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/watchdog/Makefile.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,148 @@
++#
++# Makefile for the WatchDog device drivers.
++#
++
++# Only one watchdog can succeed. We probe the ISA/PCI/USB based
++# watchdog-cards first, then the architecture specific watchdog
++# drivers and then the architecture independant "softdog" driver.
++# This means that if your ISA/PCI/USB card isn't detected that
++# you can fall back to an architecture specific driver and if
++# that also fails then you can fall back to the software watchdog
++# to give you some cover.
++
++# ISA-based Watchdog Cards
++obj-$(CONFIG_PCWATCHDOG) += pcwd.o
++obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
++obj-$(CONFIG_WDT) += wdt.o
++
++# PCI-based Watchdog Cards
++obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o
++obj-$(CONFIG_WDTPCI) += wdt_pci.o
++
++# USB-based Watchdog Cards
++obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
++
++# ALPHA Architecture
++
++# ARM Architecture
++obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o
++obj-$(CONFIG_AT91SAM9X_WATCHDOG) += at91sam9_wdt.o
++obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
++obj-$(CONFIG_TWL4030_WATCHDOG) += twl4030_wdt.o
++obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
++obj-$(CONFIG_977_WATCHDOG) += wdt977.o
++obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
++obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
++obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o
++obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
++obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
++obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
++obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o
++obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
++obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
++obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
++obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
++obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
++obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
++obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
++obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o
++obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
++obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
++
++# AVR32 Architecture
++obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
++
++# BLACKFIN Architecture
++obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o
++
++# CRIS Architecture
++
++# FRV Architecture
++
++# H8300 Architecture
++
++# X86 (i386 + ia64 + x86_64) Architecture
++obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
++obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
++obj-$(CONFIG_ALIM1535_WDT) += alim1535_wdt.o
++obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
++obj-$(CONFIG_GEODE_WDT) += geodewdt.o
++obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
++obj-$(CONFIG_SBC_FITPC2_WATCHDOG) += sbc_fitpc2_wdt.o
++obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
++obj-$(CONFIG_IB700_WDT) += ib700wdt.o
++obj-$(CONFIG_IBMASR) += ibmasr.o
++obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
++obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o
++obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o
++ifeq ($(CONFIG_ITCO_VENDOR_SUPPORT),y)
++obj-$(CONFIG_ITCO_WDT) += iTCO_vendor_support.o
++endif
++obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o
++obj-$(CONFIG_IT87_WDT) += it87_wdt.o
++obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o
++obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
++obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
++obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o
++obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o
++obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
++obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
++obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o
++obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
++obj-$(CONFIG_SMSC_SCH311X_WDT) += sch311x_wdt.o
++obj-$(CONFIG_SMSC37B787_WDT) += smsc37b787_wdt.o
++obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
++obj-$(CONFIG_W83697HF_WDT) += w83697hf_wdt.o
++obj-$(CONFIG_W83697UG_WDT) += w83697ug_wdt.o
++obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
++obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
++obj-$(CONFIG_MACHZ_WDT) += machzwd.o
++obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
++
++# M32R Architecture
++
++# M68K Architecture
++
++# M68KNOMMU Architecture
++
++# MIPS Architecture
++obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o
++obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o
++obj-$(CONFIG_INDYDOG) += indydog.o
++obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
++obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
++obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
++obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
++obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
++
++# PARISC Architecture
++
++# POWERPC Architecture
++obj-$(CONFIG_GEF_WDT) += gef_wdt.o
++obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
++obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
++obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
++obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
++
++# PPC64 Architecture
++obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
++
++# S390 Architecture
++
++# SUPERH (sh + sh64) Architecture
++obj-$(CONFIG_SH_WDT) += shwdt.o
++
++# SPARC Architecture
++
++# SPARC64 Architecture
++
++obj-$(CONFIG_WATCHDOG_RIO) += riowd.o
++obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwd.o
++
++# XTENSA Architecture
++
++# Architecture Independant
++obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o
++obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o
++obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o
++obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
+diff -Nur linux-2.6.35.7.orig/include/linux/ath9k_platform.h linux-2.6.35.7/include/linux/ath9k_platform.h
+--- linux-2.6.35.7.orig/include/linux/ath9k_platform.h 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/include/linux/ath9k_platform.h 2010-10-14 20:28:01.618101105 +0200
@@ -1,19 +1,11 @@
/*
- * Copyright (c) 2008 Atheros Communications Inc.
@@ -17349,9 +30026,9 @@ diff -Nur linux-2.6.34.orig/include/linux/ath9k_platform.h linux-2.6.34/include/
};
#endif /* _LINUX_ATH9K_PLATFORM_H */
-diff -Nur linux-2.6.34.orig/include/linux/gpio_buttons.h linux-2.6.34/include/linux/gpio_buttons.h
---- linux-2.6.34.orig/include/linux/gpio_buttons.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/include/linux/gpio_buttons.h 2010-05-25 18:46:13.322223192 +0200
+diff -Nur linux-2.6.35.7.orig/include/linux/gpio_buttons.h linux-2.6.35.7/include/linux/gpio_buttons.h
+--- linux-2.6.35.7.orig/include/linux/gpio_buttons.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/include/linux/gpio_buttons.h 2010-10-14 20:28:01.679342332 +0200
@@ -0,0 +1,33 @@
+/*
+ * Definitions for the GPIO buttons interface driver
@@ -17386,9 +30063,9 @@ diff -Nur linux-2.6.34.orig/include/linux/gpio_buttons.h linux-2.6.34/include/li
+};
+
+#endif /* _GPIO_BUTTONS_H_ */
-diff -Nur linux-2.6.34.orig/include/linux/gpio_dev.h linux-2.6.34/include/linux/gpio_dev.h
---- linux-2.6.34.orig/include/linux/gpio_dev.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/include/linux/gpio_dev.h 2010-05-25 18:46:13.380969951 +0200
+diff -Nur linux-2.6.35.7.orig/include/linux/gpio_dev.h linux-2.6.35.7/include/linux/gpio_dev.h
+--- linux-2.6.35.7.orig/include/linux/gpio_dev.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/include/linux/gpio_dev.h 2010-10-14 20:28:01.715601023 +0200
@@ -0,0 +1,11 @@
+#ifndef _GPIODEV_H__
+#define _GPIODEV_H__
@@ -17401,10 +30078,10 @@ diff -Nur linux-2.6.34.orig/include/linux/gpio_dev.h linux-2.6.34/include/linux/
+#define GPIO_DIR_OUT _IO(IOC_GPIODEV_MAGIC, 14)
+
+#endif
-diff -Nur linux-2.6.34.orig/include/linux/netdevice.h linux-2.6.34/include/linux/netdevice.h
---- linux-2.6.34.orig/include/linux/netdevice.h 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/include/linux/netdevice.h 2010-05-25 18:46:13.412222988 +0200
-@@ -863,6 +863,7 @@
+diff -Nur linux-2.6.35.7.orig/include/linux/netdevice.h linux-2.6.35.7/include/linux/netdevice.h
+--- linux-2.6.35.7.orig/include/linux/netdevice.h 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/include/linux/netdevice.h 2010-10-14 20:28:01.758101230 +0200
+@@ -932,6 +932,7 @@
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */
@@ -17412,9 +30089,2362 @@ diff -Nur linux-2.6.34.orig/include/linux/netdevice.h linux-2.6.34/include/linux
/*
* Cache line mostly used on receive path (including eth_type_trans())
-diff -Nur linux-2.6.34.orig/include/linux/nxp_74hc153.h linux-2.6.34/include/linux/nxp_74hc153.h
---- linux-2.6.34.orig/include/linux/nxp_74hc153.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/include/linux/nxp_74hc153.h 2010-05-25 18:46:13.463473072 +0200
+diff -Nur linux-2.6.35.7.orig/include/linux/netdevice.h.orig linux-2.6.35.7/include/linux/netdevice.h.orig
+--- linux-2.6.35.7.orig/include/linux/netdevice.h.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/include/linux/netdevice.h.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,2349 @@
++/*
++ * INET An implementation of the TCP/IP protocol suite for the LINUX
++ * operating system. INET is implemented using the BSD Socket
++ * interface as the means of communication with the user level.
++ *
++ * Definitions for the Interfaces handler.
++ *
++ * Version: @(#)dev.h 1.0.10 08/12/93
++ *
++ * Authors: Ross Biro
++ * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
++ * Corey Minyard <wf-rch!minyard@relay.EU.net>
++ * Donald J. Becker, <becker@cesdis.gsfc.nasa.gov>
++ * Alan Cox, <alan@lxorguk.ukuu.org.uk>
++ * Bjorn Ekwall. <bj0rn@blox.se>
++ * Pekka Riikonen <priikone@poseidon.pspt.fi>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version
++ * 2 of the License, or (at your option) any later version.
++ *
++ * Moved to /usr/include/linux for NET3
++ */
++#ifndef _LINUX_NETDEVICE_H
++#define _LINUX_NETDEVICE_H
++
++#include <linux/if.h>
++#include <linux/if_ether.h>
++#include <linux/if_packet.h>
++#include <linux/if_link.h>
++
++#ifdef __KERNEL__
++#include <linux/pm_qos_params.h>
++#include <linux/timer.h>
++#include <linux/delay.h>
++#include <linux/mm.h>
++#include <asm/atomic.h>
++#include <asm/cache.h>
++#include <asm/byteorder.h>
++
++#include <linux/device.h>
++#include <linux/percpu.h>
++#include <linux/rculist.h>
++#include <linux/dmaengine.h>
++#include <linux/workqueue.h>
++
++#include <linux/ethtool.h>
++#include <net/net_namespace.h>
++#include <net/dsa.h>
++#ifdef CONFIG_DCB
++#include <net/dcbnl.h>
++#endif
++
++struct vlan_group;
++struct netpoll_info;
++/* 802.11 specific */
++struct wireless_dev;
++ /* source back-compat hooks */
++#define SET_ETHTOOL_OPS(netdev,ops) \
++ ( (netdev)->ethtool_ops = (ops) )
++
++#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
++ functions are available. */
++#define HAVE_FREE_NETDEV /* free_netdev() */
++#define HAVE_NETDEV_PRIV /* netdev_priv() */
++
++/* Backlog congestion levels */
++#define NET_RX_SUCCESS 0 /* keep 'em coming, baby */
++#define NET_RX_DROP 1 /* packet dropped */
++
++/*
++ * Transmit return codes: transmit return codes originate from three different
++ * namespaces:
++ *
++ * - qdisc return codes
++ * - driver transmit return codes
++ * - errno values
++ *
++ * Drivers are allowed to return any one of those in their hard_start_xmit()
++ * function. Real network devices commonly used with qdiscs should only return
++ * the driver transmit return codes though - when qdiscs are used, the actual
++ * transmission happens asynchronously, so the value is not propagated to
++ * higher layers. Virtual network devices transmit synchronously, in this case
++ * the driver transmit return codes are consumed by dev_queue_xmit(), all
++ * others are propagated to higher layers.
++ */
++
++/* qdisc ->enqueue() return codes. */
++#define NET_XMIT_SUCCESS 0x00
++#define NET_XMIT_DROP 0x01 /* skb dropped */
++#define NET_XMIT_CN 0x02 /* congestion notification */
++#define NET_XMIT_POLICED 0x03 /* skb is shot by police */
++#define NET_XMIT_MASK 0x0f /* qdisc flags in net/sch_generic.h */
++
++/* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It
++ * indicates that the device will soon be dropping packets, or already drops
++ * some packets of the same priority; prompting us to send less aggressively. */
++#define net_xmit_eval(e) ((e) == NET_XMIT_CN ? 0 : (e))
++#define net_xmit_errno(e) ((e) != NET_XMIT_CN ? -ENOBUFS : 0)
++
++/* Driver transmit return codes */
++#define NETDEV_TX_MASK 0xf0
++
++enum netdev_tx {
++ __NETDEV_TX_MIN = INT_MIN, /* make sure enum is signed */
++ NETDEV_TX_OK = 0x00, /* driver took care of packet */
++ NETDEV_TX_BUSY = 0x10, /* driver tx path was busy*/
++ NETDEV_TX_LOCKED = 0x20, /* driver tx lock was already taken */
++};
++typedef enum netdev_tx netdev_tx_t;
++
++/*
++ * Current order: NETDEV_TX_MASK > NET_XMIT_MASK >= 0 is significant;
++ * hard_start_xmit() return < NET_XMIT_MASK means skb was consumed.
++ */
++static inline bool dev_xmit_complete(int rc)
++{
++ /*
++ * Positive cases with an skb consumed by a driver:
++ * - successful transmission (rc == NETDEV_TX_OK)
++ * - error while transmitting (rc < 0)
++ * - error while queueing to a different device (rc & NET_XMIT_MASK)
++ */
++ if (likely(rc < NET_XMIT_MASK))
++ return true;
++
++ return false;
++}
++
++#endif
++
++#define MAX_ADDR_LEN 32 /* Largest hardware address length */
++
++#ifdef __KERNEL__
++/*
++ * Compute the worst case header length according to the protocols
++ * used.
++ */
++
++#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
++# if defined(CONFIG_MAC80211_MESH)
++# define LL_MAX_HEADER 128
++# else
++# define LL_MAX_HEADER 96
++# endif
++#elif defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
++# define LL_MAX_HEADER 48
++#else
++# define LL_MAX_HEADER 32
++#endif
++
++#if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \
++ !defined(CONFIG_NET_IPGRE) && !defined(CONFIG_NET_IPGRE_MODULE) && \
++ !defined(CONFIG_IPV6_SIT) && !defined(CONFIG_IPV6_SIT_MODULE) && \
++ !defined(CONFIG_IPV6_TUNNEL) && !defined(CONFIG_IPV6_TUNNEL_MODULE)
++#define MAX_HEADER LL_MAX_HEADER
++#else
++#define MAX_HEADER (LL_MAX_HEADER + 48)
++#endif
++
++#endif /* __KERNEL__ */
++
++/*
++ * Network device statistics. Akin to the 2.0 ether stats but
++ * with byte counters.
++ */
++
++struct net_device_stats {
++ unsigned long rx_packets; /* total packets received */
++ unsigned long tx_packets; /* total packets transmitted */
++ unsigned long rx_bytes; /* total bytes received */
++ unsigned long tx_bytes; /* total bytes transmitted */
++ unsigned long rx_errors; /* bad packets received */
++ unsigned long tx_errors; /* packet transmit problems */
++ unsigned long rx_dropped; /* no space in linux buffers */
++ unsigned long tx_dropped; /* no space available in linux */
++ unsigned long multicast; /* multicast packets received */
++ unsigned long collisions;
++
++ /* detailed rx_errors: */
++ unsigned long rx_length_errors;
++ unsigned long rx_over_errors; /* receiver ring buff overflow */
++ unsigned long rx_crc_errors; /* recved pkt with crc error */
++ unsigned long rx_frame_errors; /* recv'd frame alignment error */
++ unsigned long rx_fifo_errors; /* recv'r fifo overrun */
++ unsigned long rx_missed_errors; /* receiver missed packet */
++
++ /* detailed tx_errors */
++ unsigned long tx_aborted_errors;
++ unsigned long tx_carrier_errors;
++ unsigned long tx_fifo_errors;
++ unsigned long tx_heartbeat_errors;
++ unsigned long tx_window_errors;
++
++ /* for cslip etc */
++ unsigned long rx_compressed;
++ unsigned long tx_compressed;
++};
++
++
++/* Media selection options. */
++enum {
++ IF_PORT_UNKNOWN = 0,
++ IF_PORT_10BASE2,
++ IF_PORT_10BASET,
++ IF_PORT_AUI,
++ IF_PORT_100BASET,
++ IF_PORT_100BASETX,
++ IF_PORT_100BASEFX
++};
++
++#ifdef __KERNEL__
++
++#include <linux/cache.h>
++#include <linux/skbuff.h>
++
++struct neighbour;
++struct neigh_parms;
++struct sk_buff;
++
++struct netdev_hw_addr {
++ struct list_head list;
++ unsigned char addr[MAX_ADDR_LEN];
++ unsigned char type;
++#define NETDEV_HW_ADDR_T_LAN 1
++#define NETDEV_HW_ADDR_T_SAN 2
++#define NETDEV_HW_ADDR_T_SLAVE 3
++#define NETDEV_HW_ADDR_T_UNICAST 4
++#define NETDEV_HW_ADDR_T_MULTICAST 5
++ int refcount;
++ bool synced;
++ bool global_use;
++ struct rcu_head rcu_head;
++};
++
++struct netdev_hw_addr_list {
++ struct list_head list;
++ int count;
++};
++
++#define netdev_hw_addr_list_count(l) ((l)->count)
++#define netdev_hw_addr_list_empty(l) (netdev_hw_addr_list_count(l) == 0)
++#define netdev_hw_addr_list_for_each(ha, l) \
++ list_for_each_entry(ha, &(l)->list, list)
++
++#define netdev_uc_count(dev) netdev_hw_addr_list_count(&(dev)->uc)
++#define netdev_uc_empty(dev) netdev_hw_addr_list_empty(&(dev)->uc)
++#define netdev_for_each_uc_addr(ha, dev) \
++ netdev_hw_addr_list_for_each(ha, &(dev)->uc)
++
++#define netdev_mc_count(dev) netdev_hw_addr_list_count(&(dev)->mc)
++#define netdev_mc_empty(dev) netdev_hw_addr_list_empty(&(dev)->mc)
++#define netdev_for_each_mc_addr(ha, dev) \
++ netdev_hw_addr_list_for_each(ha, &(dev)->mc)
++
++struct hh_cache {
++ struct hh_cache *hh_next; /* Next entry */
++ atomic_t hh_refcnt; /* number of users */
++/*
++ * We want hh_output, hh_len, hh_lock and hh_data be a in a separate
++ * cache line on SMP.
++ * They are mostly read, but hh_refcnt may be changed quite frequently,
++ * incurring cache line ping pongs.
++ */
++ __be16 hh_type ____cacheline_aligned_in_smp;
++ /* protocol identifier, f.e ETH_P_IP
++ * NOTE: For VLANs, this will be the
++ * encapuslated type. --BLG
++ */
++ u16 hh_len; /* length of header */
++ int (*hh_output)(struct sk_buff *skb);
++ seqlock_t hh_lock;
++
++ /* cached hardware header; allow for machine alignment needs. */
++#define HH_DATA_MOD 16
++#define HH_DATA_OFF(__len) \
++ (HH_DATA_MOD - (((__len - 1) & (HH_DATA_MOD - 1)) + 1))
++#define HH_DATA_ALIGN(__len) \
++ (((__len)+(HH_DATA_MOD-1))&~(HH_DATA_MOD - 1))
++ unsigned long hh_data[HH_DATA_ALIGN(LL_MAX_HEADER) / sizeof(long)];
++};
++
++/* Reserve HH_DATA_MOD byte aligned hard_header_len, but at least that much.
++ * Alternative is:
++ * dev->hard_header_len ? (dev->hard_header_len +
++ * (HH_DATA_MOD - 1)) & ~(HH_DATA_MOD - 1) : 0
++ *
++ * We could use other alignment values, but we must maintain the
++ * relationship HH alignment <= LL alignment.
++ *
++ * LL_ALLOCATED_SPACE also takes into account the tailroom the device
++ * may need.
++ */
++#define LL_RESERVED_SPACE(dev) \
++ ((((dev)->hard_header_len+(dev)->needed_headroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
++#define LL_RESERVED_SPACE_EXTRA(dev,extra) \
++ ((((dev)->hard_header_len+(dev)->needed_headroom+(extra))&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
++#define LL_ALLOCATED_SPACE(dev) \
++ ((((dev)->hard_header_len+(dev)->needed_headroom+(dev)->needed_tailroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
++
++struct header_ops {
++ int (*create) (struct sk_buff *skb, struct net_device *dev,
++ unsigned short type, const void *daddr,
++ const void *saddr, unsigned len);
++ int (*parse)(const struct sk_buff *skb, unsigned char *haddr);
++ int (*rebuild)(struct sk_buff *skb);
++#define HAVE_HEADER_CACHE
++ int (*cache)(const struct neighbour *neigh, struct hh_cache *hh);
++ void (*cache_update)(struct hh_cache *hh,
++ const struct net_device *dev,
++ const unsigned char *haddr);
++};
++
++/* These flag bits are private to the generic network queueing
++ * layer, they may not be explicitly referenced by any other
++ * code.
++ */
++
++enum netdev_state_t {
++ __LINK_STATE_START,
++ __LINK_STATE_PRESENT,
++ __LINK_STATE_NOCARRIER,
++ __LINK_STATE_LINKWATCH_PENDING,
++ __LINK_STATE_DORMANT,
++};
++
++
++/*
++ * This structure holds at boot time configured netdevice settings. They
++ * are then used in the device probing.
++ */
++struct netdev_boot_setup {
++ char name[IFNAMSIZ];
++ struct ifmap map;
++};
++#define NETDEV_BOOT_SETUP_MAX 8
++
++extern int __init netdev_boot_setup(char *str);
++
++/*
++ * Structure for NAPI scheduling similar to tasklet but with weighting
++ */
++struct napi_struct {
++ /* The poll_list must only be managed by the entity which
++ * changes the state of the NAPI_STATE_SCHED bit. This means
++ * whoever atomically sets that bit can add this napi_struct
++ * to the per-cpu poll_list, and whoever clears that bit
++ * can remove from the list right before clearing the bit.
++ */
++ struct list_head poll_list;
++
++ unsigned long state;
++ int weight;
++ int (*poll)(struct napi_struct *, int);
++#ifdef CONFIG_NETPOLL
++ spinlock_t poll_lock;
++ int poll_owner;
++#endif
++
++ unsigned int gro_count;
++
++ struct net_device *dev;
++ struct list_head dev_list;
++ struct sk_buff *gro_list;
++ struct sk_buff *skb;
++};
++
++enum {
++ NAPI_STATE_SCHED, /* Poll is scheduled */
++ NAPI_STATE_DISABLE, /* Disable pending */
++ NAPI_STATE_NPSVC, /* Netpoll - don't dequeue from poll_list */
++};
++
++enum gro_result {
++ GRO_MERGED,
++ GRO_MERGED_FREE,
++ GRO_HELD,
++ GRO_NORMAL,
++ GRO_DROP,
++};
++typedef enum gro_result gro_result_t;
++
++extern void __napi_schedule(struct napi_struct *n);
++
++static inline int napi_disable_pending(struct napi_struct *n)
++{
++ return test_bit(NAPI_STATE_DISABLE, &n->state);
++}
++
++/**
++ * napi_schedule_prep - check if napi can be scheduled
++ * @n: napi context
++ *
++ * Test if NAPI routine is already running, and if not mark
++ * it as running. This is used as a condition variable
++ * insure only one NAPI poll instance runs. We also make
++ * sure there is no pending NAPI disable.
++ */
++static inline int napi_schedule_prep(struct napi_struct *n)
++{
++ return !napi_disable_pending(n) &&
++ !test_and_set_bit(NAPI_STATE_SCHED, &n->state);
++}
++
++/**
++ * napi_schedule - schedule NAPI poll
++ * @n: napi context
++ *
++ * Schedule NAPI poll routine to be called if it is not already
++ * running.
++ */
++static inline void napi_schedule(struct napi_struct *n)
++{
++ if (napi_schedule_prep(n))
++ __napi_schedule(n);
++}
++
++/* Try to reschedule poll. Called by dev->poll() after napi_complete(). */
++static inline int napi_reschedule(struct napi_struct *napi)
++{
++ if (napi_schedule_prep(napi)) {
++ __napi_schedule(napi);
++ return 1;
++ }
++ return 0;
++}
++
++/**
++ * napi_complete - NAPI processing complete
++ * @n: napi context
++ *
++ * Mark NAPI processing as complete.
++ */
++extern void __napi_complete(struct napi_struct *n);
++extern void napi_complete(struct napi_struct *n);
++
++/**
++ * napi_disable - prevent NAPI from scheduling
++ * @n: napi context
++ *
++ * Stop NAPI from being scheduled on this context.
++ * Waits till any outstanding processing completes.
++ */
++static inline void napi_disable(struct napi_struct *n)
++{
++ set_bit(NAPI_STATE_DISABLE, &n->state);
++ while (test_and_set_bit(NAPI_STATE_SCHED, &n->state))
++ msleep(1);
++ clear_bit(NAPI_STATE_DISABLE, &n->state);
++}
++
++/**
++ * napi_enable - enable NAPI scheduling
++ * @n: napi context
++ *
++ * Resume NAPI from being scheduled on this context.
++ * Must be paired with napi_disable.
++ */
++static inline void napi_enable(struct napi_struct *n)
++{
++ BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));
++ smp_mb__before_clear_bit();
++ clear_bit(NAPI_STATE_SCHED, &n->state);
++}
++
++#ifdef CONFIG_SMP
++/**
++ * napi_synchronize - wait until NAPI is not running
++ * @n: napi context
++ *
++ * Wait until NAPI is done being scheduled on this context.
++ * Waits till any outstanding processing completes but
++ * does not disable future activations.
++ */
++static inline void napi_synchronize(const struct napi_struct *n)
++{
++ while (test_bit(NAPI_STATE_SCHED, &n->state))
++ msleep(1);
++}
++#else
++# define napi_synchronize(n) barrier()
++#endif
++
++enum netdev_queue_state_t {
++ __QUEUE_STATE_XOFF,
++ __QUEUE_STATE_FROZEN,
++};
++
++struct netdev_queue {
++/*
++ * read mostly part
++ */
++ struct net_device *dev;
++ struct Qdisc *qdisc;
++ unsigned long state;
++ struct Qdisc *qdisc_sleeping;
++/*
++ * write mostly part
++ */
++ spinlock_t _xmit_lock ____cacheline_aligned_in_smp;
++ int xmit_lock_owner;
++ /*
++ * please use this field instead of dev->trans_start
++ */
++ unsigned long trans_start;
++ unsigned long tx_bytes;
++ unsigned long tx_packets;
++ unsigned long tx_dropped;
++} ____cacheline_aligned_in_smp;
++
++#ifdef CONFIG_RPS
++/*
++ * This structure holds an RPS map which can be of variable length. The
++ * map is an array of CPUs.
++ */
++struct rps_map {
++ unsigned int len;
++ struct rcu_head rcu;
++ u16 cpus[0];
++};
++#define RPS_MAP_SIZE(_num) (sizeof(struct rps_map) + (_num * sizeof(u16)))
++
++/*
++ * The rps_dev_flow structure contains the mapping of a flow to a CPU and the
++ * tail pointer for that CPU's input queue at the time of last enqueue.
++ */
++struct rps_dev_flow {
++ u16 cpu;
++ u16 fill;
++ unsigned int last_qtail;
++};
++
++/*
++ * The rps_dev_flow_table structure contains a table of flow mappings.
++ */
++struct rps_dev_flow_table {
++ unsigned int mask;
++ struct rcu_head rcu;
++ struct work_struct free_work;
++ struct rps_dev_flow flows[0];
++};
++#define RPS_DEV_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_dev_flow_table) + \
++ (_num * sizeof(struct rps_dev_flow)))
++
++/*
++ * The rps_sock_flow_table contains mappings of flows to the last CPU
++ * on which they were processed by the application (set in recvmsg).
++ */
++struct rps_sock_flow_table {
++ unsigned int mask;
++ u16 ents[0];
++};
++#define RPS_SOCK_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_sock_flow_table) + \
++ (_num * sizeof(u16)))
++
++#define RPS_NO_CPU 0xffff
++
++static inline void rps_record_sock_flow(struct rps_sock_flow_table *table,
++ u32 hash)
++{
++ if (table && hash) {
++ unsigned int cpu, index = hash & table->mask;
++
++ /* We only give a hint, preemption can change cpu under us */
++ cpu = raw_smp_processor_id();
++
++ if (table->ents[index] != cpu)
++ table->ents[index] = cpu;
++ }
++}
++
++static inline void rps_reset_sock_flow(struct rps_sock_flow_table *table,
++ u32 hash)
++{
++ if (table && hash)
++ table->ents[hash & table->mask] = RPS_NO_CPU;
++}
++
++extern struct rps_sock_flow_table *rps_sock_flow_table;
++
++/* This structure contains an instance of an RX queue. */
++struct netdev_rx_queue {
++ struct rps_map *rps_map;
++ struct rps_dev_flow_table *rps_flow_table;
++ struct kobject kobj;
++ struct netdev_rx_queue *first;
++ atomic_t count;
++} ____cacheline_aligned_in_smp;
++#endif /* CONFIG_RPS */
++
++/*
++ * This structure defines the management hooks for network devices.
++ * The following hooks can be defined; unless noted otherwise, they are
++ * optional and can be filled with a null pointer.
++ *
++ * int (*ndo_init)(struct net_device *dev);
++ * This function is called once when network device is registered.
++ * The network device can use this to any late stage initializaton
++ * or semantic validattion. It can fail with an error code which will
++ * be propogated back to register_netdev
++ *
++ * void (*ndo_uninit)(struct net_device *dev);
++ * This function is called when device is unregistered or when registration
++ * fails. It is not called if init fails.
++ *
++ * int (*ndo_open)(struct net_device *dev);
++ * This function is called when network device transistions to the up
++ * state.
++ *
++ * int (*ndo_stop)(struct net_device *dev);
++ * This function is called when network device transistions to the down
++ * state.
++ *
++ * netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb,
++ * struct net_device *dev);
++ * Called when a packet needs to be transmitted.
++ * Must return NETDEV_TX_OK , NETDEV_TX_BUSY.
++ * (can also return NETDEV_TX_LOCKED iff NETIF_F_LLTX)
++ * Required can not be NULL.
++ *
++ * u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb);
++ * Called to decide which queue to when device supports multiple
++ * transmit queues.
++ *
++ * void (*ndo_change_rx_flags)(struct net_device *dev, int flags);
++ * This function is called to allow device receiver to make
++ * changes to configuration when multicast or promiscious is enabled.
++ *
++ * void (*ndo_set_rx_mode)(struct net_device *dev);
++ * This function is called device changes address list filtering.
++ *
++ * void (*ndo_set_multicast_list)(struct net_device *dev);
++ * This function is called when the multicast address list changes.
++ *
++ * int (*ndo_set_mac_address)(struct net_device *dev, void *addr);
++ * This function is called when the Media Access Control address
++ * needs to be changed. If this interface is not defined, the
++ * mac address can not be changed.
++ *
++ * int (*ndo_validate_addr)(struct net_device *dev);
++ * Test if Media Access Control address is valid for the device.
++ *
++ * int (*ndo_do_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd);
++ * Called when a user request an ioctl which can't be handled by
++ * the generic interface code. If not defined ioctl's return
++ * not supported error code.
++ *
++ * int (*ndo_set_config)(struct net_device *dev, struct ifmap *map);
++ * Used to set network devices bus interface parameters. This interface
++ * is retained for legacy reason, new devices should use the bus
++ * interface (PCI) for low level management.
++ *
++ * int (*ndo_change_mtu)(struct net_device *dev, int new_mtu);
++ * Called when a user wants to change the Maximum Transfer Unit
++ * of a device. If not defined, any request to change MTU will
++ * will return an error.
++ *
++ * void (*ndo_tx_timeout)(struct net_device *dev);
++ * Callback uses when the transmitter has not made any progress
++ * for dev->watchdog ticks.
++ *
++ * struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
++ * Called when a user wants to get the network device usage
++ * statistics. If not defined, the counters in dev->stats will
++ * be used.
++ *
++ * void (*ndo_vlan_rx_register)(struct net_device *dev, struct vlan_group *grp);
++ * If device support VLAN receive accleration
++ * (ie. dev->features & NETIF_F_HW_VLAN_RX), then this function is called
++ * when vlan groups for the device changes. Note: grp is NULL
++ * if no vlan's groups are being used.
++ *
++ * void (*ndo_vlan_rx_add_vid)(struct net_device *dev, unsigned short vid);
++ * If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
++ * this function is called when a VLAN id is registered.
++ *
++ * void (*ndo_vlan_rx_kill_vid)(struct net_device *dev, unsigned short vid);
++ * If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
++ * this function is called when a VLAN id is unregistered.
++ *
++ * void (*ndo_poll_controller)(struct net_device *dev);
++ *
++ * SR-IOV management functions.
++ * int (*ndo_set_vf_mac)(struct net_device *dev, int vf, u8* mac);
++ * int (*ndo_set_vf_vlan)(struct net_device *dev, int vf, u16 vlan, u8 qos);
++ * int (*ndo_set_vf_tx_rate)(struct net_device *dev, int vf, int rate);
++ * int (*ndo_get_vf_config)(struct net_device *dev,
++ * int vf, struct ifla_vf_info *ivf);
++ * int (*ndo_set_vf_port)(struct net_device *dev, int vf,
++ * struct nlattr *port[]);
++ * int (*ndo_get_vf_port)(struct net_device *dev, int vf, struct sk_buff *skb);
++ */
++#define HAVE_NET_DEVICE_OPS
++struct net_device_ops {
++ int (*ndo_init)(struct net_device *dev);
++ void (*ndo_uninit)(struct net_device *dev);
++ int (*ndo_open)(struct net_device *dev);
++ int (*ndo_stop)(struct net_device *dev);
++ netdev_tx_t (*ndo_start_xmit) (struct sk_buff *skb,
++ struct net_device *dev);
++ u16 (*ndo_select_queue)(struct net_device *dev,
++ struct sk_buff *skb);
++ void (*ndo_change_rx_flags)(struct net_device *dev,
++ int flags);
++ void (*ndo_set_rx_mode)(struct net_device *dev);
++ void (*ndo_set_multicast_list)(struct net_device *dev);
++ int (*ndo_set_mac_address)(struct net_device *dev,
++ void *addr);
++ int (*ndo_validate_addr)(struct net_device *dev);
++ int (*ndo_do_ioctl)(struct net_device *dev,
++ struct ifreq *ifr, int cmd);
++ int (*ndo_set_config)(struct net_device *dev,
++ struct ifmap *map);
++ int (*ndo_change_mtu)(struct net_device *dev,
++ int new_mtu);
++ int (*ndo_neigh_setup)(struct net_device *dev,
++ struct neigh_parms *);
++ void (*ndo_tx_timeout) (struct net_device *dev);
++
++ struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
++
++ void (*ndo_vlan_rx_register)(struct net_device *dev,
++ struct vlan_group *grp);
++ void (*ndo_vlan_rx_add_vid)(struct net_device *dev,
++ unsigned short vid);
++ void (*ndo_vlan_rx_kill_vid)(struct net_device *dev,
++ unsigned short vid);
++#ifdef CONFIG_NET_POLL_CONTROLLER
++ void (*ndo_poll_controller)(struct net_device *dev);
++ void (*ndo_netpoll_cleanup)(struct net_device *dev);
++#endif
++ int (*ndo_set_vf_mac)(struct net_device *dev,
++ int queue, u8 *mac);
++ int (*ndo_set_vf_vlan)(struct net_device *dev,
++ int queue, u16 vlan, u8 qos);
++ int (*ndo_set_vf_tx_rate)(struct net_device *dev,
++ int vf, int rate);
++ int (*ndo_get_vf_config)(struct net_device *dev,
++ int vf,
++ struct ifla_vf_info *ivf);
++ int (*ndo_set_vf_port)(struct net_device *dev,
++ int vf,
++ struct nlattr *port[]);
++ int (*ndo_get_vf_port)(struct net_device *dev,
++ int vf, struct sk_buff *skb);
++#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
++ int (*ndo_fcoe_enable)(struct net_device *dev);
++ int (*ndo_fcoe_disable)(struct net_device *dev);
++ int (*ndo_fcoe_ddp_setup)(struct net_device *dev,
++ u16 xid,
++ struct scatterlist *sgl,
++ unsigned int sgc);
++ int (*ndo_fcoe_ddp_done)(struct net_device *dev,
++ u16 xid);
++#define NETDEV_FCOE_WWNN 0
++#define NETDEV_FCOE_WWPN 1
++ int (*ndo_fcoe_get_wwn)(struct net_device *dev,
++ u64 *wwn, int type);
++#endif
++};
++
++/*
++ * The DEVICE structure.
++ * Actually, this whole structure is a big mistake. It mixes I/O
++ * data with strictly "high-level" data, and it has to know about
++ * almost every data structure used in the INET module.
++ *
++ * FIXME: cleanup struct net_device such that network protocol info
++ * moves out.
++ */
++
++struct net_device {
++
++ /*
++ * This is the first field of the "visible" part of this structure
++ * (i.e. as seen by users in the "Space.c" file). It is the name
++ * the interface.
++ */
++ char name[IFNAMSIZ];
++
++ struct pm_qos_request_list *pm_qos_req;
++
++ /* device name hash chain */
++ struct hlist_node name_hlist;
++ /* snmp alias */
++ char *ifalias;
++
++ /*
++ * I/O specific fields
++ * FIXME: Merge these and struct ifmap into one
++ */
++ unsigned long mem_end; /* shared mem end */
++ unsigned long mem_start; /* shared mem start */
++ unsigned long base_addr; /* device I/O address */
++ unsigned int irq; /* device IRQ number */
++
++ /*
++ * Some hardware also needs these fields, but they are not
++ * part of the usual set specified in Space.c.
++ */
++
++ unsigned char if_port; /* Selectable AUI, TP,..*/
++ unsigned char dma; /* DMA channel */
++
++ unsigned long state;
++
++ struct list_head dev_list;
++ struct list_head napi_list;
++ struct list_head unreg_list;
++
++ /* Net device features */
++ unsigned long features;
++#define NETIF_F_SG 1 /* Scatter/gather IO. */
++#define NETIF_F_IP_CSUM 2 /* Can checksum TCP/UDP over IPv4. */
++#define NETIF_F_NO_CSUM 4 /* Does not require checksum. F.e. loopack. */
++#define NETIF_F_HW_CSUM 8 /* Can checksum all the packets. */
++#define NETIF_F_IPV6_CSUM 16 /* Can checksum TCP/UDP over IPV6 */
++#define NETIF_F_HIGHDMA 32 /* Can DMA to high memory. */
++#define NETIF_F_FRAGLIST 64 /* Scatter/gather IO. */
++#define NETIF_F_HW_VLAN_TX 128 /* Transmit VLAN hw acceleration */
++#define NETIF_F_HW_VLAN_RX 256 /* Receive VLAN hw acceleration */
++#define NETIF_F_HW_VLAN_FILTER 512 /* Receive filtering on VLAN */
++#define NETIF_F_VLAN_CHALLENGED 1024 /* Device cannot handle VLAN packets */
++#define NETIF_F_GSO 2048 /* Enable software GSO. */
++#define NETIF_F_LLTX 4096 /* LockLess TX - deprecated. Please */
++ /* do not use LLTX in new drivers */
++#define NETIF_F_NETNS_LOCAL 8192 /* Does not change network namespaces */
++#define NETIF_F_GRO 16384 /* Generic receive offload */
++#define NETIF_F_LRO 32768 /* large receive offload */
++
++/* the GSO_MASK reserves bits 16 through 23 */
++#define NETIF_F_FCOE_CRC (1 << 24) /* FCoE CRC32 */
++#define NETIF_F_SCTP_CSUM (1 << 25) /* SCTP checksum offload */
++#define NETIF_F_FCOE_MTU (1 << 26) /* Supports max FCoE MTU, 2158 bytes*/
++#define NETIF_F_NTUPLE (1 << 27) /* N-tuple filters supported */
++#define NETIF_F_RXHASH (1 << 28) /* Receive hashing offload */
++
++ /* Segmentation offload features */
++#define NETIF_F_GSO_SHIFT 16
++#define NETIF_F_GSO_MASK 0x00ff0000
++#define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)
++#define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT)
++#define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)
++#define NETIF_F_TSO_ECN (SKB_GSO_TCP_ECN << NETIF_F_GSO_SHIFT)
++#define NETIF_F_TSO6 (SKB_GSO_TCPV6 << NETIF_F_GSO_SHIFT)
++#define NETIF_F_FSO (SKB_GSO_FCOE << NETIF_F_GSO_SHIFT)
++
++ /* List of features with software fallbacks. */
++#define NETIF_F_GSO_SOFTWARE (NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
++
++
++#define NETIF_F_GEN_CSUM (NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
++#define NETIF_F_V4_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IP_CSUM)
++#define NETIF_F_V6_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM)
++#define NETIF_F_ALL_CSUM (NETIF_F_V4_CSUM | NETIF_F_V6_CSUM)
++
++ /*
++ * If one device supports one of these features, then enable them
++ * for all in netdev_increment_features.
++ */
++#define NETIF_F_ONE_FOR_ALL (NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ROBUST | \
++ NETIF_F_SG | NETIF_F_HIGHDMA | \
++ NETIF_F_FRAGLIST)
++
++ /* Interface index. Unique device identifier */
++ int ifindex;
++ int iflink;
++
++ struct net_device_stats stats;
++
++#ifdef CONFIG_WIRELESS_EXT
++ /* List of functions to handle Wireless Extensions (instead of ioctl).
++ * See <net/iw_handler.h> for details. Jean II */
++ const struct iw_handler_def * wireless_handlers;
++ /* Instance data managed by the core of Wireless Extensions. */
++ struct iw_public_data * wireless_data;
++#endif
++ /* Management operations */
++ const struct net_device_ops *netdev_ops;
++ const struct ethtool_ops *ethtool_ops;
++
++ /* Hardware header description */
++ const struct header_ops *header_ops;
++
++ unsigned int flags; /* interface flags (a la BSD) */
++ unsigned short gflags;
++ unsigned short priv_flags; /* Like 'flags' but invisible to userspace. */
++ unsigned short padded; /* How much padding added by alloc_netdev() */
++
++ unsigned char operstate; /* RFC2863 operstate */
++ unsigned char link_mode; /* mapping policy to operstate */
++
++ unsigned int mtu; /* interface MTU value */
++ unsigned short type; /* interface hardware type */
++ unsigned short hard_header_len; /* hardware hdr length */
++
++ /* extra head- and tailroom the hardware may need, but not in all cases
++ * can this be guaranteed, especially tailroom. Some cases also use
++ * LL_MAX_HEADER instead to allocate the skb.
++ */
++ unsigned short needed_headroom;
++ unsigned short needed_tailroom;
++
++ struct net_device *master; /* Pointer to master device of a group,
++ * which this device is member of.
++ */
++
++ /* Interface address info. */
++ unsigned char perm_addr[MAX_ADDR_LEN]; /* permanent hw address */
++ unsigned char addr_len; /* hardware address length */
++ unsigned short dev_id; /* for shared network cards */
++
++ spinlock_t addr_list_lock;
++ struct netdev_hw_addr_list uc; /* Unicast mac addresses */
++ struct netdev_hw_addr_list mc; /* Multicast mac addresses */
++ int uc_promisc;
++ unsigned int promiscuity;
++ unsigned int allmulti;
++
++
++ /* Protocol specific pointers */
++
++#ifdef CONFIG_NET_DSA
++ void *dsa_ptr; /* dsa specific data */
++#endif
++ void *atalk_ptr; /* AppleTalk link */
++ void *ip_ptr; /* IPv4 specific data */
++ void *dn_ptr; /* DECnet specific data */
++ void *ip6_ptr; /* IPv6 specific data */
++ void *ec_ptr; /* Econet specific data */
++ void *ax25_ptr; /* AX.25 specific data */
++ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
++ assign before registering */
++
++/*
++ * Cache line mostly used on receive path (including eth_type_trans())
++ */
++ unsigned long last_rx; /* Time of last Rx */
++ /* Interface address info used in eth_type_trans() */
++ unsigned char *dev_addr; /* hw address, (before bcast
++ because most packets are
++ unicast) */
++
++ struct netdev_hw_addr_list dev_addrs; /* list of device
++ hw addresses */
++
++ unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */
++
++#ifdef CONFIG_RPS
++ struct kset *queues_kset;
++
++ struct netdev_rx_queue *_rx;
++
++ /* Number of RX queues allocated at alloc_netdev_mq() time */
++ unsigned int num_rx_queues;
++#endif
++
++ struct netdev_queue rx_queue;
++
++ struct netdev_queue *_tx ____cacheline_aligned_in_smp;
++
++ /* Number of TX queues allocated at alloc_netdev_mq() time */
++ unsigned int num_tx_queues;
++
++ /* Number of TX queues currently active in device */
++ unsigned int real_num_tx_queues;
++
++ /* root qdisc from userspace point of view */
++ struct Qdisc *qdisc;
++
++ unsigned long tx_queue_len; /* Max frames per queue allowed */
++ spinlock_t tx_global_lock;
++/*
++ * One part is mostly used on xmit path (device)
++ */
++ /* These may be needed for future network-power-down code. */
++
++ /*
++ * trans_start here is expensive for high speed devices on SMP,
++ * please use netdev_queue->trans_start instead.
++ */
++ unsigned long trans_start; /* Time (in jiffies) of last Tx */
++
++ int watchdog_timeo; /* used by dev_watchdog() */
++ struct timer_list watchdog_timer;
++
++ /* Number of references to this device */
++ atomic_t refcnt ____cacheline_aligned_in_smp;
++
++ /* delayed register/unregister */
++ struct list_head todo_list;
++ /* device index hash chain */
++ struct hlist_node index_hlist;
++
++ struct list_head link_watch_list;
++
++ /* register/unregister state machine */
++ enum { NETREG_UNINITIALIZED=0,
++ NETREG_REGISTERED, /* completed register_netdevice */
++ NETREG_UNREGISTERING, /* called unregister_netdevice */
++ NETREG_UNREGISTERED, /* completed unregister todo */
++ NETREG_RELEASED, /* called free_netdev */
++ NETREG_DUMMY, /* dummy device for NAPI poll */
++ } reg_state:16;
++
++ enum {
++ RTNL_LINK_INITIALIZED,
++ RTNL_LINK_INITIALIZING,
++ } rtnl_link_state:16;
++
++ /* Called from unregister, can be used to call free_netdev */
++ void (*destructor)(struct net_device *dev);
++
++#ifdef CONFIG_NETPOLL
++ struct netpoll_info *npinfo;
++#endif
++
++#ifdef CONFIG_NET_NS
++ /* Network namespace this network device is inside */
++ struct net *nd_net;
++#endif
++
++ /* mid-layer private */
++ void *ml_priv;
++
++ /* bridge stuff */
++ struct net_bridge_port *br_port;
++ /* macvlan */
++ struct macvlan_port *macvlan_port;
++ /* GARP */
++ struct garp_port *garp_port;
++
++ /* class/net/name entry */
++ struct device dev;
++ /* space for optional device, statistics, and wireless sysfs groups */
++ const struct attribute_group *sysfs_groups[4];
++
++ /* rtnetlink link ops */
++ const struct rtnl_link_ops *rtnl_link_ops;
++
++ /* VLAN feature mask */
++ unsigned long vlan_features;
++
++ /* for setting kernel sock attribute on TCP connection setup */
++#define GSO_MAX_SIZE 65536
++ unsigned int gso_max_size;
++
++#ifdef CONFIG_DCB
++ /* Data Center Bridging netlink ops */
++ const struct dcbnl_rtnl_ops *dcbnl_ops;
++#endif
++
++#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
++ /* max exchange id for FCoE LRO by ddp */
++ unsigned int fcoe_ddp_xid;
++#endif
++ /* n-tuple filter list attached to this device */
++ struct ethtool_rx_ntuple_list ethtool_ntuple_list;
++};
++#define to_net_dev(d) container_of(d, struct net_device, dev)
++
++#define NETDEV_ALIGN 32
++
++static inline
++struct netdev_queue *netdev_get_tx_queue(const struct net_device *dev,
++ unsigned int index)
++{
++ return &dev->_tx[index];
++}
++
++static inline void netdev_for_each_tx_queue(struct net_device *dev,
++ void (*f)(struct net_device *,
++ struct netdev_queue *,
++ void *),
++ void *arg)
++{
++ unsigned int i;
++
++ for (i = 0; i < dev->num_tx_queues; i++)
++ f(dev, &dev->_tx[i], arg);
++}
++
++/*
++ * Net namespace inlines
++ */
++static inline
++struct net *dev_net(const struct net_device *dev)
++{
++#ifdef CONFIG_NET_NS
++ return dev->nd_net;
++#else
++ return &init_net;
++#endif
++}
++
++static inline
++void dev_net_set(struct net_device *dev, struct net *net)
++{
++#ifdef CONFIG_NET_NS
++ release_net(dev->nd_net);
++ dev->nd_net = hold_net(net);
++#endif
++}
++
++static inline bool netdev_uses_dsa_tags(struct net_device *dev)
++{
++#ifdef CONFIG_NET_DSA_TAG_DSA
++ if (dev->dsa_ptr != NULL)
++ return dsa_uses_dsa_tags(dev->dsa_ptr);
++#endif
++
++ return 0;
++}
++
++#ifndef CONFIG_NET_NS
++static inline void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
++{
++ skb->dev = dev;
++}
++#else /* CONFIG_NET_NS */
++void skb_set_dev(struct sk_buff *skb, struct net_device *dev);
++#endif
++
++static inline bool netdev_uses_trailer_tags(struct net_device *dev)
++{
++#ifdef CONFIG_NET_DSA_TAG_TRAILER
++ if (dev->dsa_ptr != NULL)
++ return dsa_uses_trailer_tags(dev->dsa_ptr);
++#endif
++
++ return 0;
++}
++
++/**
++ * netdev_priv - access network device private data
++ * @dev: network device
++ *
++ * Get network device private data
++ */
++static inline void *netdev_priv(const struct net_device *dev)
++{
++ return (char *)dev + ALIGN(sizeof(struct net_device), NETDEV_ALIGN);
++}
++
++/* Set the sysfs physical device reference for the network logical device
++ * if set prior to registration will cause a symlink during initialization.
++ */
++#define SET_NETDEV_DEV(net, pdev) ((net)->dev.parent = (pdev))
++
++/* Set the sysfs device type for the network logical device to allow
++ * fin grained indentification of different network device types. For
++ * example Ethernet, Wirelss LAN, Bluetooth, WiMAX etc.
++ */
++#define SET_NETDEV_DEVTYPE(net, devtype) ((net)->dev.type = (devtype))
++
++/**
++ * netif_napi_add - initialize a napi context
++ * @dev: network device
++ * @napi: napi context
++ * @poll: polling function
++ * @weight: default weight
++ *
++ * netif_napi_add() must be used to initialize a napi context prior to calling
++ * *any* of the other napi related functions.
++ */
++void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
++ int (*poll)(struct napi_struct *, int), int weight);
++
++/**
++ * netif_napi_del - remove a napi context
++ * @napi: napi context
++ *
++ * netif_napi_del() removes a napi context from the network device napi list
++ */
++void netif_napi_del(struct napi_struct *napi);
++
++struct napi_gro_cb {
++ /* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */
++ void *frag0;
++
++ /* Length of frag0. */
++ unsigned int frag0_len;
++
++ /* This indicates where we are processing relative to skb->data. */
++ int data_offset;
++
++ /* This is non-zero if the packet may be of the same flow. */
++ int same_flow;
++
++ /* This is non-zero if the packet cannot be merged with the new skb. */
++ int flush;
++
++ /* Number of segments aggregated. */
++ int count;
++
++ /* Free the skb? */
++ int free;
++};
++
++#define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)
++
++struct packet_type {
++ __be16 type; /* This is really htons(ether_type). */
++ struct net_device *dev; /* NULL is wildcarded here */
++ int (*func) (struct sk_buff *,
++ struct net_device *,
++ struct packet_type *,
++ struct net_device *);
++ struct sk_buff *(*gso_segment)(struct sk_buff *skb,
++ int features);
++ int (*gso_send_check)(struct sk_buff *skb);
++ struct sk_buff **(*gro_receive)(struct sk_buff **head,
++ struct sk_buff *skb);
++ int (*gro_complete)(struct sk_buff *skb);
++ void *af_packet_priv;
++ struct list_head list;
++};
++
++#include <linux/interrupt.h>
++#include <linux/notifier.h>
++
++extern rwlock_t dev_base_lock; /* Device list lock */
++
++
++#define for_each_netdev(net, d) \
++ list_for_each_entry(d, &(net)->dev_base_head, dev_list)
++#define for_each_netdev_reverse(net, d) \
++ list_for_each_entry_reverse(d, &(net)->dev_base_head, dev_list)
++#define for_each_netdev_rcu(net, d) \
++ list_for_each_entry_rcu(d, &(net)->dev_base_head, dev_list)
++#define for_each_netdev_safe(net, d, n) \
++ list_for_each_entry_safe(d, n, &(net)->dev_base_head, dev_list)
++#define for_each_netdev_continue(net, d) \
++ list_for_each_entry_continue(d, &(net)->dev_base_head, dev_list)
++#define for_each_netdev_continue_rcu(net, d) \
++ list_for_each_entry_continue_rcu(d, &(net)->dev_base_head, dev_list)
++#define net_device_entry(lh) list_entry(lh, struct net_device, dev_list)
++
++static inline struct net_device *next_net_device(struct net_device *dev)
++{
++ struct list_head *lh;
++ struct net *net;
++
++ net = dev_net(dev);
++ lh = dev->dev_list.next;
++ return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
++}
++
++static inline struct net_device *next_net_device_rcu(struct net_device *dev)
++{
++ struct list_head *lh;
++ struct net *net;
++
++ net = dev_net(dev);
++ lh = rcu_dereference(dev->dev_list.next);
++ return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
++}
++
++static inline struct net_device *first_net_device(struct net *net)
++{
++ return list_empty(&net->dev_base_head) ? NULL :
++ net_device_entry(net->dev_base_head.next);
++}
++
++extern int netdev_boot_setup_check(struct net_device *dev);
++extern unsigned long netdev_boot_base(const char *prefix, int unit);
++extern struct net_device *dev_getbyhwaddr(struct net *net, unsigned short type, char *hwaddr);
++extern struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type);
++extern struct net_device *__dev_getfirstbyhwtype(struct net *net, unsigned short type);
++extern void dev_add_pack(struct packet_type *pt);
++extern void dev_remove_pack(struct packet_type *pt);
++extern void __dev_remove_pack(struct packet_type *pt);
++
++extern struct net_device *dev_get_by_flags(struct net *net, unsigned short flags,
++ unsigned short mask);
++extern struct net_device *dev_get_by_name(struct net *net, const char *name);
++extern struct net_device *dev_get_by_name_rcu(struct net *net, const char *name);
++extern struct net_device *__dev_get_by_name(struct net *net, const char *name);
++extern int dev_alloc_name(struct net_device *dev, const char *name);
++extern int dev_open(struct net_device *dev);
++extern int dev_close(struct net_device *dev);
++extern void dev_disable_lro(struct net_device *dev);
++extern int dev_queue_xmit(struct sk_buff *skb);
++extern int register_netdevice(struct net_device *dev);
++extern void unregister_netdevice_queue(struct net_device *dev,
++ struct list_head *head);
++extern void unregister_netdevice_many(struct list_head *head);
++static inline void unregister_netdevice(struct net_device *dev)
++{
++ unregister_netdevice_queue(dev, NULL);
++}
++
++extern void free_netdev(struct net_device *dev);
++extern void synchronize_net(void);
++extern int register_netdevice_notifier(struct notifier_block *nb);
++extern int unregister_netdevice_notifier(struct notifier_block *nb);
++extern int init_dummy_netdev(struct net_device *dev);
++extern void netdev_resync_ops(struct net_device *dev);
++
++extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
++extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
++extern struct net_device *__dev_get_by_index(struct net *net, int ifindex);
++extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
++extern int dev_restart(struct net_device *dev);
++#ifdef CONFIG_NETPOLL_TRAP
++extern int netpoll_trap(void);
++#endif
++extern int skb_gro_receive(struct sk_buff **head,
++ struct sk_buff *skb);
++extern void skb_gro_reset_offset(struct sk_buff *skb);
++
++static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
++{
++ return NAPI_GRO_CB(skb)->data_offset;
++}
++
++static inline unsigned int skb_gro_len(const struct sk_buff *skb)
++{
++ return skb->len - NAPI_GRO_CB(skb)->data_offset;
++}
++
++static inline void skb_gro_pull(struct sk_buff *skb, unsigned int len)
++{
++ NAPI_GRO_CB(skb)->data_offset += len;
++}
++
++static inline void *skb_gro_header_fast(struct sk_buff *skb,
++ unsigned int offset)
++{
++ return NAPI_GRO_CB(skb)->frag0 + offset;
++}
++
++static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen)
++{
++ return NAPI_GRO_CB(skb)->frag0_len < hlen;
++}
++
++static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
++ unsigned int offset)
++{
++ NAPI_GRO_CB(skb)->frag0 = NULL;
++ NAPI_GRO_CB(skb)->frag0_len = 0;
++ return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL;
++}
++
++static inline void *skb_gro_mac_header(struct sk_buff *skb)
++{
++ return NAPI_GRO_CB(skb)->frag0 ?: skb_mac_header(skb);
++}
++
++static inline void *skb_gro_network_header(struct sk_buff *skb)
++{
++ return (NAPI_GRO_CB(skb)->frag0 ?: skb->data) +
++ skb_network_offset(skb);
++}
++
++static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
++ unsigned short type,
++ const void *daddr, const void *saddr,
++ unsigned len)
++{
++ if (!dev->header_ops || !dev->header_ops->create)
++ return 0;
++
++ return dev->header_ops->create(skb, dev, type, daddr, saddr, len);
++}
++
++static inline int dev_parse_header(const struct sk_buff *skb,
++ unsigned char *haddr)
++{
++ const struct net_device *dev = skb->dev;
++
++ if (!dev->header_ops || !dev->header_ops->parse)
++ return 0;
++ return dev->header_ops->parse(skb, haddr);
++}
++
++typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len);
++extern int register_gifconf(unsigned int family, gifconf_func_t * gifconf);
++static inline int unregister_gifconf(unsigned int family)
++{
++ return register_gifconf(family, NULL);
++}
++
++/*
++ * Incoming packets are placed on per-cpu queues
++ */
++struct softnet_data {
++ struct Qdisc *output_queue;
++ struct Qdisc **output_queue_tailp;
++ struct list_head poll_list;
++ struct sk_buff *completion_queue;
++ struct sk_buff_head process_queue;
++
++ /* stats */
++ unsigned int processed;
++ unsigned int time_squeeze;
++ unsigned int cpu_collision;
++ unsigned int received_rps;
++
++#ifdef CONFIG_RPS
++ struct softnet_data *rps_ipi_list;
++
++ /* Elements below can be accessed between CPUs for RPS */
++ struct call_single_data csd ____cacheline_aligned_in_smp;
++ struct softnet_data *rps_ipi_next;
++ unsigned int cpu;
++ unsigned int input_queue_head;
++ unsigned int input_queue_tail;
++#endif
++ unsigned dropped;
++ struct sk_buff_head input_pkt_queue;
++ struct napi_struct backlog;
++};
++
++static inline void input_queue_head_incr(struct softnet_data *sd)
++{
++#ifdef CONFIG_RPS
++ sd->input_queue_head++;
++#endif
++}
++
++static inline void input_queue_tail_incr_save(struct softnet_data *sd,
++ unsigned int *qtail)
++{
++#ifdef CONFIG_RPS
++ *qtail = ++sd->input_queue_tail;
++#endif
++}
++
++DECLARE_PER_CPU_ALIGNED(struct softnet_data, softnet_data);
++
++#define HAVE_NETIF_QUEUE
++
++extern void __netif_schedule(struct Qdisc *q);
++
++static inline void netif_schedule_queue(struct netdev_queue *txq)
++{
++ if (!test_bit(__QUEUE_STATE_XOFF, &txq->state))
++ __netif_schedule(txq->qdisc);
++}
++
++static inline void netif_tx_schedule_all(struct net_device *dev)
++{
++ unsigned int i;
++
++ for (i = 0; i < dev->num_tx_queues; i++)
++ netif_schedule_queue(netdev_get_tx_queue(dev, i));
++}
++
++static inline void netif_tx_start_queue(struct netdev_queue *dev_queue)
++{
++ clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
++}
++
++/**
++ * netif_start_queue - allow transmit
++ * @dev: network device
++ *
++ * Allow upper layers to call the device hard_start_xmit routine.
++ */
++static inline void netif_start_queue(struct net_device *dev)
++{
++ netif_tx_start_queue(netdev_get_tx_queue(dev, 0));
++}
++
++static inline void netif_tx_start_all_queues(struct net_device *dev)
++{
++ unsigned int i;
++
++ for (i = 0; i < dev->num_tx_queues; i++) {
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
++ netif_tx_start_queue(txq);
++ }
++}
++
++static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue)
++{
++#ifdef CONFIG_NETPOLL_TRAP
++ if (netpoll_trap()) {
++ netif_tx_start_queue(dev_queue);
++ return;
++ }
++#endif
++ if (test_and_clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state))
++ __netif_schedule(dev_queue->qdisc);
++}
++
++/**
++ * netif_wake_queue - restart transmit
++ * @dev: network device
++ *
++ * Allow upper layers to call the device hard_start_xmit routine.
++ * Used for flow control when transmit resources are available.
++ */
++static inline void netif_wake_queue(struct net_device *dev)
++{
++ netif_tx_wake_queue(netdev_get_tx_queue(dev, 0));
++}
++
++static inline void netif_tx_wake_all_queues(struct net_device *dev)
++{
++ unsigned int i;
++
++ for (i = 0; i < dev->num_tx_queues; i++) {
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
++ netif_tx_wake_queue(txq);
++ }
++}
++
++static inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
++{
++ set_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
++}
++
++/**
++ * netif_stop_queue - stop transmitted packets
++ * @dev: network device
++ *
++ * Stop upper layers calling the device hard_start_xmit routine.
++ * Used for flow control when transmit resources are unavailable.
++ */
++static inline void netif_stop_queue(struct net_device *dev)
++{
++ netif_tx_stop_queue(netdev_get_tx_queue(dev, 0));
++}
++
++static inline void netif_tx_stop_all_queues(struct net_device *dev)
++{
++ unsigned int i;
++
++ for (i = 0; i < dev->num_tx_queues; i++) {
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
++ netif_tx_stop_queue(txq);
++ }
++}
++
++static inline int netif_tx_queue_stopped(const struct netdev_queue *dev_queue)
++{
++ return test_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
++}
++
++/**
++ * netif_queue_stopped - test if transmit queue is flowblocked
++ * @dev: network device
++ *
++ * Test if transmit queue on device is currently unable to send.
++ */
++static inline int netif_queue_stopped(const struct net_device *dev)
++{
++ return netif_tx_queue_stopped(netdev_get_tx_queue(dev, 0));
++}
++
++static inline int netif_tx_queue_frozen(const struct netdev_queue *dev_queue)
++{
++ return test_bit(__QUEUE_STATE_FROZEN, &dev_queue->state);
++}
++
++/**
++ * netif_running - test if up
++ * @dev: network device
++ *
++ * Test if the device has been brought up.
++ */
++static inline int netif_running(const struct net_device *dev)
++{
++ return test_bit(__LINK_STATE_START, &dev->state);
++}
++
++/*
++ * Routines to manage the subqueues on a device. We only need start
++ * stop, and a check if it's stopped. All other device management is
++ * done at the overall netdevice level.
++ * Also test the device if we're multiqueue.
++ */
++
++/**
++ * netif_start_subqueue - allow sending packets on subqueue
++ * @dev: network device
++ * @queue_index: sub queue index
++ *
++ * Start individual transmit queue of a device with multiple transmit queues.
++ */
++static inline void netif_start_subqueue(struct net_device *dev, u16 queue_index)
++{
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
++
++ netif_tx_start_queue(txq);
++}
++
++/**
++ * netif_stop_subqueue - stop sending packets on subqueue
++ * @dev: network device
++ * @queue_index: sub queue index
++ *
++ * Stop individual transmit queue of a device with multiple transmit queues.
++ */
++static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
++{
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
++#ifdef CONFIG_NETPOLL_TRAP
++ if (netpoll_trap())
++ return;
++#endif
++ netif_tx_stop_queue(txq);
++}
++
++/**
++ * netif_subqueue_stopped - test status of subqueue
++ * @dev: network device
++ * @queue_index: sub queue index
++ *
++ * Check individual transmit queue of a device with multiple transmit queues.
++ */
++static inline int __netif_subqueue_stopped(const struct net_device *dev,
++ u16 queue_index)
++{
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
++
++ return netif_tx_queue_stopped(txq);
++}
++
++static inline int netif_subqueue_stopped(const struct net_device *dev,
++ struct sk_buff *skb)
++{
++ return __netif_subqueue_stopped(dev, skb_get_queue_mapping(skb));
++}
++
++/**
++ * netif_wake_subqueue - allow sending packets on subqueue
++ * @dev: network device
++ * @queue_index: sub queue index
++ *
++ * Resume individual transmit queue of a device with multiple transmit queues.
++ */
++static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
++{
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
++#ifdef CONFIG_NETPOLL_TRAP
++ if (netpoll_trap())
++ return;
++#endif
++ if (test_and_clear_bit(__QUEUE_STATE_XOFF, &txq->state))
++ __netif_schedule(txq->qdisc);
++}
++
++/**
++ * netif_is_multiqueue - test if device has multiple transmit queues
++ * @dev: network device
++ *
++ * Check if device has multiple transmit queues
++ */
++static inline int netif_is_multiqueue(const struct net_device *dev)
++{
++ return (dev->num_tx_queues > 1);
++}
++
++extern void netif_set_real_num_tx_queues(struct net_device *dev,
++ unsigned int txq);
++
++/* Use this variant when it is known for sure that it
++ * is executing from hardware interrupt context or with hardware interrupts
++ * disabled.
++ */
++extern void dev_kfree_skb_irq(struct sk_buff *skb);
++
++/* Use this variant in places where it could be invoked
++ * from either hardware interrupt or other context, with hardware interrupts
++ * either disabled or enabled.
++ */
++extern void dev_kfree_skb_any(struct sk_buff *skb);
++
++#define HAVE_NETIF_RX 1
++extern int netif_rx(struct sk_buff *skb);
++extern int netif_rx_ni(struct sk_buff *skb);
++#define HAVE_NETIF_RECEIVE_SKB 1
++extern int netif_receive_skb(struct sk_buff *skb);
++extern gro_result_t dev_gro_receive(struct napi_struct *napi,
++ struct sk_buff *skb);
++extern gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb);
++extern gro_result_t napi_gro_receive(struct napi_struct *napi,
++ struct sk_buff *skb);
++extern void napi_reuse_skb(struct napi_struct *napi,
++ struct sk_buff *skb);
++extern struct sk_buff * napi_get_frags(struct napi_struct *napi);
++extern gro_result_t napi_frags_finish(struct napi_struct *napi,
++ struct sk_buff *skb,
++ gro_result_t ret);
++extern struct sk_buff * napi_frags_skb(struct napi_struct *napi);
++extern gro_result_t napi_gro_frags(struct napi_struct *napi);
++
++static inline void napi_free_frags(struct napi_struct *napi)
++{
++ kfree_skb(napi->skb);
++ napi->skb = NULL;
++}
++
++extern void netif_nit_deliver(struct sk_buff *skb);
++extern int dev_valid_name(const char *name);
++extern int dev_ioctl(struct net *net, unsigned int cmd, void __user *);
++extern int dev_ethtool(struct net *net, struct ifreq *);
++extern unsigned dev_get_flags(const struct net_device *);
++extern int __dev_change_flags(struct net_device *, unsigned int flags);
++extern int dev_change_flags(struct net_device *, unsigned);
++extern void __dev_notify_flags(struct net_device *, unsigned int old_flags);
++extern int dev_change_name(struct net_device *, const char *);
++extern int dev_set_alias(struct net_device *, const char *, size_t);
++extern int dev_change_net_namespace(struct net_device *,
++ struct net *, const char *);
++extern int dev_set_mtu(struct net_device *, int);
++extern int dev_set_mac_address(struct net_device *,
++ struct sockaddr *);
++extern int dev_hard_start_xmit(struct sk_buff *skb,
++ struct net_device *dev,
++ struct netdev_queue *txq);
++extern int dev_forward_skb(struct net_device *dev,
++ struct sk_buff *skb);
++
++extern int netdev_budget;
++
++/* Called by rtnetlink.c:rtnl_unlock() */
++extern void netdev_run_todo(void);
++
++/**
++ * dev_put - release reference to device
++ * @dev: network device
++ *
++ * Release reference to device to allow it to be freed.
++ */
++static inline void dev_put(struct net_device *dev)
++{
++ atomic_dec(&dev->refcnt);
++}
++
++/**
++ * dev_hold - get reference to device
++ * @dev: network device
++ *
++ * Hold reference to device to keep it from being freed.
++ */
++static inline void dev_hold(struct net_device *dev)
++{
++ atomic_inc(&dev->refcnt);
++}
++
++/* Carrier loss detection, dial on demand. The functions netif_carrier_on
++ * and _off may be called from IRQ context, but it is caller
++ * who is responsible for serialization of these calls.
++ *
++ * The name carrier is inappropriate, these functions should really be
++ * called netif_lowerlayer_*() because they represent the state of any
++ * kind of lower layer not just hardware media.
++ */
++
++extern void linkwatch_fire_event(struct net_device *dev);
++extern void linkwatch_forget_dev(struct net_device *dev);
++
++/**
++ * netif_carrier_ok - test if carrier present
++ * @dev: network device
++ *
++ * Check if carrier is present on device
++ */
++static inline int netif_carrier_ok(const struct net_device *dev)
++{
++ return !test_bit(__LINK_STATE_NOCARRIER, &dev->state);
++}
++
++extern unsigned long dev_trans_start(struct net_device *dev);
++
++extern void __netdev_watchdog_up(struct net_device *dev);
++
++extern void netif_carrier_on(struct net_device *dev);
++
++extern void netif_carrier_off(struct net_device *dev);
++
++extern void netif_notify_peers(struct net_device *dev);
++
++/**
++ * netif_dormant_on - mark device as dormant.
++ * @dev: network device
++ *
++ * Mark device as dormant (as per RFC2863).
++ *
++ * The dormant state indicates that the relevant interface is not
++ * actually in a condition to pass packets (i.e., it is not 'up') but is
++ * in a "pending" state, waiting for some external event. For "on-
++ * demand" interfaces, this new state identifies the situation where the
++ * interface is waiting for events to place it in the up state.
++ *
++ */
++static inline void netif_dormant_on(struct net_device *dev)
++{
++ if (!test_and_set_bit(__LINK_STATE_DORMANT, &dev->state))
++ linkwatch_fire_event(dev);
++}
++
++/**
++ * netif_dormant_off - set device as not dormant.
++ * @dev: network device
++ *
++ * Device is not in dormant state.
++ */
++static inline void netif_dormant_off(struct net_device *dev)
++{
++ if (test_and_clear_bit(__LINK_STATE_DORMANT, &dev->state))
++ linkwatch_fire_event(dev);
++}
++
++/**
++ * netif_dormant - test if carrier present
++ * @dev: network device
++ *
++ * Check if carrier is present on device
++ */
++static inline int netif_dormant(const struct net_device *dev)
++{
++ return test_bit(__LINK_STATE_DORMANT, &dev->state);
++}
++
++
++/**
++ * netif_oper_up - test if device is operational
++ * @dev: network device
++ *
++ * Check if carrier is operational
++ */
++static inline int netif_oper_up(const struct net_device *dev)
++{
++ return (dev->operstate == IF_OPER_UP ||
++ dev->operstate == IF_OPER_UNKNOWN /* backward compat */);
++}
++
++/**
++ * netif_device_present - is device available or removed
++ * @dev: network device
++ *
++ * Check if device has not been removed from system.
++ */
++static inline int netif_device_present(struct net_device *dev)
++{
++ return test_bit(__LINK_STATE_PRESENT, &dev->state);
++}
++
++extern void netif_device_detach(struct net_device *dev);
++
++extern void netif_device_attach(struct net_device *dev);
++
++/*
++ * Network interface message level settings
++ */
++#define HAVE_NETIF_MSG 1
++
++enum {
++ NETIF_MSG_DRV = 0x0001,
++ NETIF_MSG_PROBE = 0x0002,
++ NETIF_MSG_LINK = 0x0004,
++ NETIF_MSG_TIMER = 0x0008,
++ NETIF_MSG_IFDOWN = 0x0010,
++ NETIF_MSG_IFUP = 0x0020,
++ NETIF_MSG_RX_ERR = 0x0040,
++ NETIF_MSG_TX_ERR = 0x0080,
++ NETIF_MSG_TX_QUEUED = 0x0100,
++ NETIF_MSG_INTR = 0x0200,
++ NETIF_MSG_TX_DONE = 0x0400,
++ NETIF_MSG_RX_STATUS = 0x0800,
++ NETIF_MSG_PKTDATA = 0x1000,
++ NETIF_MSG_HW = 0x2000,
++ NETIF_MSG_WOL = 0x4000,
++};
++
++#define netif_msg_drv(p) ((p)->msg_enable & NETIF_MSG_DRV)
++#define netif_msg_probe(p) ((p)->msg_enable & NETIF_MSG_PROBE)
++#define netif_msg_link(p) ((p)->msg_enable & NETIF_MSG_LINK)
++#define netif_msg_timer(p) ((p)->msg_enable & NETIF_MSG_TIMER)
++#define netif_msg_ifdown(p) ((p)->msg_enable & NETIF_MSG_IFDOWN)
++#define netif_msg_ifup(p) ((p)->msg_enable & NETIF_MSG_IFUP)
++#define netif_msg_rx_err(p) ((p)->msg_enable & NETIF_MSG_RX_ERR)
++#define netif_msg_tx_err(p) ((p)->msg_enable & NETIF_MSG_TX_ERR)
++#define netif_msg_tx_queued(p) ((p)->msg_enable & NETIF_MSG_TX_QUEUED)
++#define netif_msg_intr(p) ((p)->msg_enable & NETIF_MSG_INTR)
++#define netif_msg_tx_done(p) ((p)->msg_enable & NETIF_MSG_TX_DONE)
++#define netif_msg_rx_status(p) ((p)->msg_enable & NETIF_MSG_RX_STATUS)
++#define netif_msg_pktdata(p) ((p)->msg_enable & NETIF_MSG_PKTDATA)
++#define netif_msg_hw(p) ((p)->msg_enable & NETIF_MSG_HW)
++#define netif_msg_wol(p) ((p)->msg_enable & NETIF_MSG_WOL)
++
++static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)
++{
++ /* use default */
++ if (debug_value < 0 || debug_value >= (sizeof(u32) * 8))
++ return default_msg_enable_bits;
++ if (debug_value == 0) /* no output */
++ return 0;
++ /* set low N bits */
++ return (1 << debug_value) - 1;
++}
++
++static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu)
++{
++ spin_lock(&txq->_xmit_lock);
++ txq->xmit_lock_owner = cpu;
++}
++
++static inline void __netif_tx_lock_bh(struct netdev_queue *txq)
++{
++ spin_lock_bh(&txq->_xmit_lock);
++ txq->xmit_lock_owner = smp_processor_id();
++}
++
++static inline int __netif_tx_trylock(struct netdev_queue *txq)
++{
++ int ok = spin_trylock(&txq->_xmit_lock);
++ if (likely(ok))
++ txq->xmit_lock_owner = smp_processor_id();
++ return ok;
++}
++
++static inline void __netif_tx_unlock(struct netdev_queue *txq)
++{
++ txq->xmit_lock_owner = -1;
++ spin_unlock(&txq->_xmit_lock);
++}
++
++static inline void __netif_tx_unlock_bh(struct netdev_queue *txq)
++{
++ txq->xmit_lock_owner = -1;
++ spin_unlock_bh(&txq->_xmit_lock);
++}
++
++static inline void txq_trans_update(struct netdev_queue *txq)
++{
++ if (txq->xmit_lock_owner != -1)
++ txq->trans_start = jiffies;
++}
++
++/**
++ * netif_tx_lock - grab network device transmit lock
++ * @dev: network device
++ *
++ * Get network device transmit lock
++ */
++static inline void netif_tx_lock(struct net_device *dev)
++{
++ unsigned int i;
++ int cpu;
++
++ spin_lock(&dev->tx_global_lock);
++ cpu = smp_processor_id();
++ for (i = 0; i < dev->num_tx_queues; i++) {
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
++
++ /* We are the only thread of execution doing a
++ * freeze, but we have to grab the _xmit_lock in
++ * order to synchronize with threads which are in
++ * the ->hard_start_xmit() handler and already
++ * checked the frozen bit.
++ */
++ __netif_tx_lock(txq, cpu);
++ set_bit(__QUEUE_STATE_FROZEN, &txq->state);
++ __netif_tx_unlock(txq);
++ }
++}
++
++static inline void netif_tx_lock_bh(struct net_device *dev)
++{
++ local_bh_disable();
++ netif_tx_lock(dev);
++}
++
++static inline void netif_tx_unlock(struct net_device *dev)
++{
++ unsigned int i;
++
++ for (i = 0; i < dev->num_tx_queues; i++) {
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
++
++ /* No need to grab the _xmit_lock here. If the
++ * queue is not stopped for another reason, we
++ * force a schedule.
++ */
++ clear_bit(__QUEUE_STATE_FROZEN, &txq->state);
++ netif_schedule_queue(txq);
++ }
++ spin_unlock(&dev->tx_global_lock);
++}
++
++static inline void netif_tx_unlock_bh(struct net_device *dev)
++{
++ netif_tx_unlock(dev);
++ local_bh_enable();
++}
++
++#define HARD_TX_LOCK(dev, txq, cpu) { \
++ if ((dev->features & NETIF_F_LLTX) == 0) { \
++ __netif_tx_lock(txq, cpu); \
++ } \
++}
++
++#define HARD_TX_UNLOCK(dev, txq) { \
++ if ((dev->features & NETIF_F_LLTX) == 0) { \
++ __netif_tx_unlock(txq); \
++ } \
++}
++
++static inline void netif_tx_disable(struct net_device *dev)
++{
++ unsigned int i;
++ int cpu;
++
++ local_bh_disable();
++ cpu = smp_processor_id();
++ for (i = 0; i < dev->num_tx_queues; i++) {
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
++
++ __netif_tx_lock(txq, cpu);
++ netif_tx_stop_queue(txq);
++ __netif_tx_unlock(txq);
++ }
++ local_bh_enable();
++}
++
++static inline void netif_addr_lock(struct net_device *dev)
++{
++ spin_lock(&dev->addr_list_lock);
++}
++
++static inline void netif_addr_lock_bh(struct net_device *dev)
++{
++ spin_lock_bh(&dev->addr_list_lock);
++}
++
++static inline void netif_addr_unlock(struct net_device *dev)
++{
++ spin_unlock(&dev->addr_list_lock);
++}
++
++static inline void netif_addr_unlock_bh(struct net_device *dev)
++{
++ spin_unlock_bh(&dev->addr_list_lock);
++}
++
++/*
++ * dev_addrs walker. Should be used only for read access. Call with
++ * rcu_read_lock held.
++ */
++#define for_each_dev_addr(dev, ha) \
++ list_for_each_entry_rcu(ha, &dev->dev_addrs.list, list)
++
++/* These functions live elsewhere (drivers/net/net_init.c, but related) */
++
++extern void ether_setup(struct net_device *dev);
++
++/* Support for loadable net-drivers */
++extern struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
++ void (*setup)(struct net_device *),
++ unsigned int queue_count);
++#define alloc_netdev(sizeof_priv, name, setup) \
++ alloc_netdev_mq(sizeof_priv, name, setup, 1)
++extern int register_netdev(struct net_device *dev);
++extern void unregister_netdev(struct net_device *dev);
++
++/* General hardware address lists handling functions */
++extern int __hw_addr_add_multiple(struct netdev_hw_addr_list *to_list,
++ struct netdev_hw_addr_list *from_list,
++ int addr_len, unsigned char addr_type);
++extern void __hw_addr_del_multiple(struct netdev_hw_addr_list *to_list,
++ struct netdev_hw_addr_list *from_list,
++ int addr_len, unsigned char addr_type);
++extern int __hw_addr_sync(struct netdev_hw_addr_list *to_list,
++ struct netdev_hw_addr_list *from_list,
++ int addr_len);
++extern void __hw_addr_unsync(struct netdev_hw_addr_list *to_list,
++ struct netdev_hw_addr_list *from_list,
++ int addr_len);
++extern void __hw_addr_flush(struct netdev_hw_addr_list *list);
++extern void __hw_addr_init(struct netdev_hw_addr_list *list);
++
++/* Functions used for device addresses handling */
++extern int dev_addr_add(struct net_device *dev, unsigned char *addr,
++ unsigned char addr_type);
++extern int dev_addr_del(struct net_device *dev, unsigned char *addr,
++ unsigned char addr_type);
++extern int dev_addr_add_multiple(struct net_device *to_dev,
++ struct net_device *from_dev,
++ unsigned char addr_type);
++extern int dev_addr_del_multiple(struct net_device *to_dev,
++ struct net_device *from_dev,
++ unsigned char addr_type);
++extern void dev_addr_flush(struct net_device *dev);
++extern int dev_addr_init(struct net_device *dev);
++
++/* Functions used for unicast addresses handling */
++extern int dev_uc_add(struct net_device *dev, unsigned char *addr);
++extern int dev_uc_del(struct net_device *dev, unsigned char *addr);
++extern int dev_uc_sync(struct net_device *to, struct net_device *from);
++extern void dev_uc_unsync(struct net_device *to, struct net_device *from);
++extern void dev_uc_flush(struct net_device *dev);
++extern void dev_uc_init(struct net_device *dev);
++
++/* Functions used for multicast addresses handling */
++extern int dev_mc_add(struct net_device *dev, unsigned char *addr);
++extern int dev_mc_add_global(struct net_device *dev, unsigned char *addr);
++extern int dev_mc_del(struct net_device *dev, unsigned char *addr);
++extern int dev_mc_del_global(struct net_device *dev, unsigned char *addr);
++extern int dev_mc_sync(struct net_device *to, struct net_device *from);
++extern void dev_mc_unsync(struct net_device *to, struct net_device *from);
++extern void dev_mc_flush(struct net_device *dev);
++extern void dev_mc_init(struct net_device *dev);
++
++/* Functions used for secondary unicast and multicast support */
++extern void dev_set_rx_mode(struct net_device *dev);
++extern void __dev_set_rx_mode(struct net_device *dev);
++extern int dev_set_promiscuity(struct net_device *dev, int inc);
++extern int dev_set_allmulti(struct net_device *dev, int inc);
++extern void netdev_state_change(struct net_device *dev);
++extern int netdev_bonding_change(struct net_device *dev,
++ unsigned long event);
++extern void netdev_features_change(struct net_device *dev);
++/* Load a device via the kmod */
++extern void dev_load(struct net *net, const char *name);
++extern void dev_mcast_init(void);
++extern const struct net_device_stats *dev_get_stats(struct net_device *dev);
++extern void dev_txq_stats_fold(const struct net_device *dev, struct net_device_stats *stats);
++
++extern int netdev_max_backlog;
++extern int netdev_tstamp_prequeue;
++extern int weight_p;
++extern int netdev_set_master(struct net_device *dev, struct net_device *master);
++extern int skb_checksum_help(struct sk_buff *skb);
++extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features);
++#ifdef CONFIG_BUG
++extern void netdev_rx_csum_fault(struct net_device *dev);
++#else
++static inline void netdev_rx_csum_fault(struct net_device *dev)
++{
++}
++#endif
++/* rx skb timestamps */
++extern void net_enable_timestamp(void);
++extern void net_disable_timestamp(void);
++
++#ifdef CONFIG_PROC_FS
++extern void *dev_seq_start(struct seq_file *seq, loff_t *pos);
++extern void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos);
++extern void dev_seq_stop(struct seq_file *seq, void *v);
++#endif
++
++extern int netdev_class_create_file(struct class_attribute *class_attr);
++extern void netdev_class_remove_file(struct class_attribute *class_attr);
++
++extern char *netdev_drivername(const struct net_device *dev, char *buffer, int len);
++
++extern void linkwatch_run_queue(void);
++
++unsigned long netdev_increment_features(unsigned long all, unsigned long one,
++ unsigned long mask);
++unsigned long netdev_fix_features(unsigned long features, const char *name);
++
++void netif_stacked_transfer_operstate(const struct net_device *rootdev,
++ struct net_device *dev);
++
++static inline int net_gso_ok(int features, int gso_type)
++{
++ int feature = gso_type << NETIF_F_GSO_SHIFT;
++ return (features & feature) == feature;
++}
++
++static inline int skb_gso_ok(struct sk_buff *skb, int features)
++{
++ return net_gso_ok(features, skb_shinfo(skb)->gso_type) &&
++ (!skb_has_frags(skb) || (features & NETIF_F_FRAGLIST));
++}
++
++static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
++{
++ return skb_is_gso(skb) &&
++ (!skb_gso_ok(skb, dev->features) ||
++ unlikely(skb->ip_summed != CHECKSUM_PARTIAL));
++}
++
++static inline void netif_set_gso_max_size(struct net_device *dev,
++ unsigned int size)
++{
++ dev->gso_max_size = size;
++}
++
++extern int __skb_bond_should_drop(struct sk_buff *skb,
++ struct net_device *master);
++
++static inline int skb_bond_should_drop(struct sk_buff *skb,
++ struct net_device *master)
++{
++ if (master)
++ return __skb_bond_should_drop(skb, master);
++ return 0;
++}
++
++extern struct pernet_operations __net_initdata loopback_net_ops;
++
++static inline int dev_ethtool_get_settings(struct net_device *dev,
++ struct ethtool_cmd *cmd)
++{
++ if (!dev->ethtool_ops || !dev->ethtool_ops->get_settings)
++ return -EOPNOTSUPP;
++ return dev->ethtool_ops->get_settings(dev, cmd);
++}
++
++static inline u32 dev_ethtool_get_rx_csum(struct net_device *dev)
++{
++ if (!dev->ethtool_ops || !dev->ethtool_ops->get_rx_csum)
++ return 0;
++ return dev->ethtool_ops->get_rx_csum(dev);
++}
++
++static inline u32 dev_ethtool_get_flags(struct net_device *dev)
++{
++ if (!dev->ethtool_ops || !dev->ethtool_ops->get_flags)
++ return 0;
++ return dev->ethtool_ops->get_flags(dev);
++}
++
++/* Logging, debugging and troubleshooting/diagnostic helpers. */
++
++/* netdev_printk helpers, similar to dev_printk */
++
++static inline const char *netdev_name(const struct net_device *dev)
++{
++ if (dev->reg_state != NETREG_REGISTERED)
++ return "(unregistered net_device)";
++ return dev->name;
++}
++
++#define netdev_printk(level, netdev, format, args...) \
++ dev_printk(level, (netdev)->dev.parent, \
++ "%s: " format, \
++ netdev_name(netdev), ##args)
++
++#define netdev_emerg(dev, format, args...) \
++ netdev_printk(KERN_EMERG, dev, format, ##args)
++#define netdev_alert(dev, format, args...) \
++ netdev_printk(KERN_ALERT, dev, format, ##args)
++#define netdev_crit(dev, format, args...) \
++ netdev_printk(KERN_CRIT, dev, format, ##args)
++#define netdev_err(dev, format, args...) \
++ netdev_printk(KERN_ERR, dev, format, ##args)
++#define netdev_warn(dev, format, args...) \
++ netdev_printk(KERN_WARNING, dev, format, ##args)
++#define netdev_notice(dev, format, args...) \
++ netdev_printk(KERN_NOTICE, dev, format, ##args)
++#define netdev_info(dev, format, args...) \
++ netdev_printk(KERN_INFO, dev, format, ##args)
++
++#if defined(DEBUG)
++#define netdev_dbg(__dev, format, args...) \
++ netdev_printk(KERN_DEBUG, __dev, format, ##args)
++#elif defined(CONFIG_DYNAMIC_DEBUG)
++#define netdev_dbg(__dev, format, args...) \
++do { \
++ dynamic_dev_dbg((__dev)->dev.parent, "%s: " format, \
++ netdev_name(__dev), ##args); \
++} while (0)
++#else
++#define netdev_dbg(__dev, format, args...) \
++({ \
++ if (0) \
++ netdev_printk(KERN_DEBUG, __dev, format, ##args); \
++ 0; \
++})
++#endif
++
++#if defined(VERBOSE_DEBUG)
++#define netdev_vdbg netdev_dbg
++#else
++
++#define netdev_vdbg(dev, format, args...) \
++({ \
++ if (0) \
++ netdev_printk(KERN_DEBUG, dev, format, ##args); \
++ 0; \
++})
++#endif
++
++/*
++ * netdev_WARN() acts like dev_printk(), but with the key difference
++ * of using a WARN/WARN_ON to get the message out, including the
++ * file/line information and a backtrace.
++ */
++#define netdev_WARN(dev, format, args...) \
++ WARN(1, "netdevice: %s\n" format, netdev_name(dev), ##args);
++
++/* netif printk helpers, similar to netdev_printk */
++
++#define netif_printk(priv, type, level, dev, fmt, args...) \
++do { \
++ if (netif_msg_##type(priv)) \
++ netdev_printk(level, (dev), fmt, ##args); \
++} while (0)
++
++#define netif_emerg(priv, type, dev, fmt, args...) \
++ netif_printk(priv, type, KERN_EMERG, dev, fmt, ##args)
++#define netif_alert(priv, type, dev, fmt, args...) \
++ netif_printk(priv, type, KERN_ALERT, dev, fmt, ##args)
++#define netif_crit(priv, type, dev, fmt, args...) \
++ netif_printk(priv, type, KERN_CRIT, dev, fmt, ##args)
++#define netif_err(priv, type, dev, fmt, args...) \
++ netif_printk(priv, type, KERN_ERR, dev, fmt, ##args)
++#define netif_warn(priv, type, dev, fmt, args...) \
++ netif_printk(priv, type, KERN_WARNING, dev, fmt, ##args)
++#define netif_notice(priv, type, dev, fmt, args...) \
++ netif_printk(priv, type, KERN_NOTICE, dev, fmt, ##args)
++#define netif_info(priv, type, dev, fmt, args...) \
++ netif_printk(priv, type, KERN_INFO, (dev), fmt, ##args)
++
++#if defined(DEBUG)
++#define netif_dbg(priv, type, dev, format, args...) \
++ netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
++#elif defined(CONFIG_DYNAMIC_DEBUG)
++#define netif_dbg(priv, type, netdev, format, args...) \
++do { \
++ if (netif_msg_##type(priv)) \
++ dynamic_dev_dbg((netdev)->dev.parent, \
++ "%s: " format, \
++ netdev_name(netdev), ##args); \
++} while (0)
++#else
++#define netif_dbg(priv, type, dev, format, args...) \
++({ \
++ if (0) \
++ netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
++ 0; \
++})
++#endif
++
++#if defined(VERBOSE_DEBUG)
++#define netif_vdbg netif_dbg
++#else
++#define netif_vdbg(priv, type, dev, format, args...) \
++({ \
++ if (0) \
++ netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
++ 0; \
++})
++#endif
++
++#endif /* __KERNEL__ */
++
++#endif /* _LINUX_NETDEVICE_H */
+diff -Nur linux-2.6.35.7.orig/include/linux/nxp_74hc153.h linux-2.6.35.7/include/linux/nxp_74hc153.h
+--- linux-2.6.35.7.orig/include/linux/nxp_74hc153.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/include/linux/nxp_74hc153.h 2010-10-14 20:28:01.798101112 +0200
@@ -0,0 +1,24 @@
+/*
+ * NXP 74HC153 - Dual 4-input multiplexer defines
@@ -17440,10 +32470,10 @@ diff -Nur linux-2.6.34.orig/include/linux/nxp_74hc153.h linux-2.6.34/include/lin
+};
+
+#endif /* _NXP_74HC153_H */
-diff -Nur linux-2.6.34.orig/include/linux/phy.h linux-2.6.34/include/linux/phy.h
---- linux-2.6.34.orig/include/linux/phy.h 2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/include/linux/phy.h 2010-05-25 18:46:13.503473452 +0200
-@@ -325,6 +325,20 @@
+diff -Nur linux-2.6.35.7.orig/include/linux/phy.h linux-2.6.35.7/include/linux/phy.h
+--- linux-2.6.35.7.orig/include/linux/phy.h 2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/include/linux/phy.h 2010-10-14 20:28:01.834368168 +0200
+@@ -330,6 +330,20 @@
void (*adjust_link)(struct net_device *dev);
void (*adjust_state)(struct net_device *dev);
@@ -17464,7 +32494,7 @@ diff -Nur linux-2.6.34.orig/include/linux/phy.h linux-2.6.34/include/linux/phy.h
};
#define to_phy_device(d) container_of(d, struct phy_device, dev)
-@@ -492,6 +506,7 @@
+@@ -497,6 +511,7 @@
void phy_stop_machine(struct phy_device *phydev);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
@@ -17472,9 +32502,532 @@ diff -Nur linux-2.6.34.orig/include/linux/phy.h linux-2.6.34/include/linux/phy.h
int phy_mii_ioctl(struct phy_device *phydev,
struct mii_ioctl_data *mii_data, int cmd);
int phy_start_interrupts(struct phy_device *phydev);
-diff -Nur linux-2.6.34.orig/include/linux/spi/vsc7385.h linux-2.6.34/include/linux/spi/vsc7385.h
---- linux-2.6.34.orig/include/linux/spi/vsc7385.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/include/linux/spi/vsc7385.h 2010-05-25 18:46:13.540971583 +0200
+diff -Nur linux-2.6.35.7.orig/include/linux/phy.h.orig linux-2.6.35.7/include/linux/phy.h.orig
+--- linux-2.6.35.7.orig/include/linux/phy.h.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/include/linux/phy.h.orig 2010-09-29 03:09:08.000000000 +0200
+@@ -0,0 +1,519 @@
++/*
++ * include/linux/phy.h
++ *
++ * Framework and drivers for configuring and reading different PHYs
++ * Based on code in sungem_phy.c and gianfar_phy.c
++ *
++ * Author: Andy Fleming
++ *
++ * Copyright (c) 2004 Freescale Semiconductor, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ */
++
++#ifndef __PHY_H
++#define __PHY_H
++
++#include <linux/spinlock.h>
++#include <linux/device.h>
++#include <linux/ethtool.h>
++#include <linux/mii.h>
++#include <linux/timer.h>
++#include <linux/workqueue.h>
++#include <linux/mod_devicetable.h>
++
++#include <asm/atomic.h>
++
++#define PHY_BASIC_FEATURES (SUPPORTED_10baseT_Half | \
++ SUPPORTED_10baseT_Full | \
++ SUPPORTED_100baseT_Half | \
++ SUPPORTED_100baseT_Full | \
++ SUPPORTED_Autoneg | \
++ SUPPORTED_TP | \
++ SUPPORTED_MII)
++
++#define PHY_GBIT_FEATURES (PHY_BASIC_FEATURES | \
++ SUPPORTED_1000baseT_Half | \
++ SUPPORTED_1000baseT_Full)
++
++/*
++ * Set phydev->irq to PHY_POLL if interrupts are not supported,
++ * or not desired for this PHY. Set to PHY_IGNORE_INTERRUPT if
++ * the attached driver handles the interrupt
++ */
++#define PHY_POLL -1
++#define PHY_IGNORE_INTERRUPT -2
++
++#define PHY_HAS_INTERRUPT 0x00000001
++#define PHY_HAS_MAGICANEG 0x00000002
++
++/* Interface Mode definitions */
++typedef enum {
++ PHY_INTERFACE_MODE_MII,
++ PHY_INTERFACE_MODE_GMII,
++ PHY_INTERFACE_MODE_SGMII,
++ PHY_INTERFACE_MODE_TBI,
++ PHY_INTERFACE_MODE_RMII,
++ PHY_INTERFACE_MODE_RGMII,
++ PHY_INTERFACE_MODE_RGMII_ID,
++ PHY_INTERFACE_MODE_RGMII_RXID,
++ PHY_INTERFACE_MODE_RGMII_TXID,
++ PHY_INTERFACE_MODE_RTBI
++} phy_interface_t;
++
++
++#define PHY_INIT_TIMEOUT 100000
++#define PHY_STATE_TIME 1
++#define PHY_FORCE_TIMEOUT 10
++#define PHY_AN_TIMEOUT 10
++
++#define PHY_MAX_ADDR 32
++
++/* Used when trying to connect to a specific phy (mii bus id:phy device id) */
++#define PHY_ID_FMT "%s:%02x"
++
++/*
++ * Need to be a little smaller than phydev->dev.bus_id to leave room
++ * for the ":%02x"
++ */
++#define MII_BUS_ID_SIZE (20 - 3)
++
++/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit
++ IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */
++#define MII_ADDR_C45 (1<<30)
++
++/*
++ * The Bus class for PHYs. Devices which provide access to
++ * PHYs should register using this structure
++ */
++struct mii_bus {
++ const char *name;
++ char id[MII_BUS_ID_SIZE];
++ void *priv;
++ int (*read)(struct mii_bus *bus, int phy_id, int regnum);
++ int (*write)(struct mii_bus *bus, int phy_id, int regnum, u16 val);
++ int (*reset)(struct mii_bus *bus);
++
++ /*
++ * A lock to ensure that only one thing can read/write
++ * the MDIO bus at a time
++ */
++ struct mutex mdio_lock;
++
++ struct device *parent;
++ enum {
++ MDIOBUS_ALLOCATED = 1,
++ MDIOBUS_REGISTERED,
++ MDIOBUS_UNREGISTERED,
++ MDIOBUS_RELEASED,
++ } state;
++ struct device dev;
++
++ /* list of all PHYs on bus */
++ struct phy_device *phy_map[PHY_MAX_ADDR];
++
++ /* Phy addresses to be ignored when probing */
++ u32 phy_mask;
++
++ /*
++ * Pointer to an array of interrupts, each PHY's
++ * interrupt at the index matching its address
++ */
++ int *irq;
++};
++#define to_mii_bus(d) container_of(d, struct mii_bus, dev)
++
++struct mii_bus *mdiobus_alloc(void);
++int mdiobus_register(struct mii_bus *bus);
++void mdiobus_unregister(struct mii_bus *bus);
++void mdiobus_free(struct mii_bus *bus);
++struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
++int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum);
++int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val);
++
++
++#define PHY_INTERRUPT_DISABLED 0x0
++#define PHY_INTERRUPT_ENABLED 0x80000000
++
++/* PHY state machine states:
++ *
++ * DOWN: PHY device and driver are not ready for anything. probe
++ * should be called if and only if the PHY is in this state,
++ * given that the PHY device exists.
++ * - PHY driver probe function will, depending on the PHY, set
++ * the state to STARTING or READY
++ *
++ * STARTING: PHY device is coming up, and the ethernet driver is
++ * not ready. PHY drivers may set this in the probe function.
++ * If they do, they are responsible for making sure the state is
++ * eventually set to indicate whether the PHY is UP or READY,
++ * depending on the state when the PHY is done starting up.
++ * - PHY driver will set the state to READY
++ * - start will set the state to PENDING
++ *
++ * READY: PHY is ready to send and receive packets, but the
++ * controller is not. By default, PHYs which do not implement
++ * probe will be set to this state by phy_probe(). If the PHY
++ * driver knows the PHY is ready, and the PHY state is STARTING,
++ * then it sets this STATE.
++ * - start will set the state to UP
++ *
++ * PENDING: PHY device is coming up, but the ethernet driver is
++ * ready. phy_start will set this state if the PHY state is
++ * STARTING.
++ * - PHY driver will set the state to UP when the PHY is ready
++ *
++ * UP: The PHY and attached device are ready to do work.
++ * Interrupts should be started here.
++ * - timer moves to AN
++ *
++ * AN: The PHY is currently negotiating the link state. Link is
++ * therefore down for now. phy_timer will set this state when it
++ * detects the state is UP. config_aneg will set this state
++ * whenever called with phydev->autoneg set to AUTONEG_ENABLE.
++ * - If autonegotiation finishes, but there's no link, it sets
++ * the state to NOLINK.
++ * - If aneg finishes with link, it sets the state to RUNNING,
++ * and calls adjust_link
++ * - If autonegotiation did not finish after an arbitrary amount
++ * of time, autonegotiation should be tried again if the PHY
++ * supports "magic" autonegotiation (back to AN)
++ * - If it didn't finish, and no magic_aneg, move to FORCING.
++ *
++ * NOLINK: PHY is up, but not currently plugged in.
++ * - If the timer notes that the link comes back, we move to RUNNING
++ * - config_aneg moves to AN
++ * - phy_stop moves to HALTED
++ *
++ * FORCING: PHY is being configured with forced settings
++ * - if link is up, move to RUNNING
++ * - If link is down, we drop to the next highest setting, and
++ * retry (FORCING) after a timeout
++ * - phy_stop moves to HALTED
++ *
++ * RUNNING: PHY is currently up, running, and possibly sending
++ * and/or receiving packets
++ * - timer will set CHANGELINK if we're polling (this ensures the
++ * link state is polled every other cycle of this state machine,
++ * which makes it every other second)
++ * - irq will set CHANGELINK
++ * - config_aneg will set AN
++ * - phy_stop moves to HALTED
++ *
++ * CHANGELINK: PHY experienced a change in link state
++ * - timer moves to RUNNING if link
++ * - timer moves to NOLINK if the link is down
++ * - phy_stop moves to HALTED
++ *
++ * HALTED: PHY is up, but no polling or interrupts are done. Or
++ * PHY is in an error state.
++ *
++ * - phy_start moves to RESUMING
++ *
++ * RESUMING: PHY was halted, but now wants to run again.
++ * - If we are forcing, or aneg is done, timer moves to RUNNING
++ * - If aneg is not done, timer moves to AN
++ * - phy_stop moves to HALTED
++ */
++enum phy_state {
++ PHY_DOWN=0,
++ PHY_STARTING,
++ PHY_READY,
++ PHY_PENDING,
++ PHY_UP,
++ PHY_AN,
++ PHY_RUNNING,
++ PHY_NOLINK,
++ PHY_FORCING,
++ PHY_CHANGELINK,
++ PHY_HALTED,
++ PHY_RESUMING
++};
++
++/* phy_device: An instance of a PHY
++ *
++ * drv: Pointer to the driver for this PHY instance
++ * bus: Pointer to the bus this PHY is on
++ * dev: driver model device structure for this PHY
++ * phy_id: UID for this device found during discovery
++ * state: state of the PHY for management purposes
++ * dev_flags: Device-specific flags used by the PHY driver.
++ * addr: Bus address of PHY
++ * link_timeout: The number of timer firings to wait before the
++ * giving up on the current attempt at acquiring a link
++ * irq: IRQ number of the PHY's interrupt (-1 if none)
++ * phy_timer: The timer for handling the state machine
++ * phy_queue: A work_queue for the interrupt
++ * attached_dev: The attached enet driver's device instance ptr
++ * adjust_link: Callback for the enet controller to respond to
++ * changes in the link state.
++ * adjust_state: Callback for the enet driver to respond to
++ * changes in the state machine.
++ *
++ * speed, duplex, pause, supported, advertising, and
++ * autoneg are used like in mii_if_info
++ *
++ * interrupts currently only supports enabled or disabled,
++ * but could be changed in the future to support enabling
++ * and disabling specific interrupts
++ *
++ * Contains some infrastructure for polling and interrupt
++ * handling, as well as handling shifts in PHY hardware state
++ */
++struct phy_device {
++ /* Information about the PHY type */
++ /* And management functions */
++ struct phy_driver *drv;
++
++ struct mii_bus *bus;
++
++ struct device dev;
++
++ u32 phy_id;
++
++ enum phy_state state;
++
++ u32 dev_flags;
++
++ phy_interface_t interface;
++
++ /* Bus address of the PHY (0-32) */
++ int addr;
++
++ /*
++ * forced speed & duplex (no autoneg)
++ * partner speed & duplex & pause (autoneg)
++ */
++ int speed;
++ int duplex;
++ int pause;
++ int asym_pause;
++
++ /* The most recently read link state */
++ int link;
++
++ /* Enabled Interrupts */
++ u32 interrupts;
++
++ /* Union of PHY and Attached devices' supported modes */
++ /* See mii.h for more info */
++ u32 supported;
++ u32 advertising;
++
++ int autoneg;
++
++ int link_timeout;
++
++ /*
++ * Interrupt number for this PHY
++ * -1 means no interrupt
++ */
++ int irq;
++
++ /* private data pointer */
++ /* For use by PHYs to maintain extra state */
++ void *priv;
++
++ /* Interrupt and Polling infrastructure */
++ struct work_struct phy_queue;
++ struct delayed_work state_queue;
++ atomic_t irq_disable;
++
++ struct mutex lock;
++
++ struct net_device *attached_dev;
++
++ void (*adjust_link)(struct net_device *dev);
++
++ void (*adjust_state)(struct net_device *dev);
++};
++#define to_phy_device(d) container_of(d, struct phy_device, dev)
++
++/* struct phy_driver: Driver structure for a particular PHY type
++ *
++ * phy_id: The result of reading the UID registers of this PHY
++ * type, and ANDing them with the phy_id_mask. This driver
++ * only works for PHYs with IDs which match this field
++ * name: The friendly name of this PHY type
++ * phy_id_mask: Defines the important bits of the phy_id
++ * features: A list of features (speed, duplex, etc) supported
++ * by this PHY
++ * flags: A bitfield defining certain other features this PHY
++ * supports (like interrupts)
++ *
++ * The drivers must implement config_aneg and read_status. All
++ * other functions are optional. Note that none of these
++ * functions should be called from interrupt time. The goal is
++ * for the bus read/write functions to be able to block when the
++ * bus transaction is happening, and be freed up by an interrupt
++ * (The MPC85xx has this ability, though it is not currently
++ * supported in the driver).
++ */
++struct phy_driver {
++ u32 phy_id;
++ char *name;
++ unsigned int phy_id_mask;
++ u32 features;
++ u32 flags;
++
++ /*
++ * Called to initialize the PHY,
++ * including after a reset
++ */
++ int (*config_init)(struct phy_device *phydev);
++
++ /*
++ * Called during discovery. Used to set
++ * up device-specific structures, if any
++ */
++ int (*probe)(struct phy_device *phydev);
++
++ /* PHY Power Management */
++ int (*suspend)(struct phy_device *phydev);
++ int (*resume)(struct phy_device *phydev);
++
++ /*
++ * Configures the advertisement and resets
++ * autonegotiation if phydev->autoneg is on,
++ * forces the speed to the current settings in phydev
++ * if phydev->autoneg is off
++ */
++ int (*config_aneg)(struct phy_device *phydev);
++
++ /* Determines the negotiated speed and duplex */
++ int (*read_status)(struct phy_device *phydev);
++
++ /* Clears any pending interrupts */
++ int (*ack_interrupt)(struct phy_device *phydev);
++
++ /* Enables or disables interrupts */
++ int (*config_intr)(struct phy_device *phydev);
++
++ /*
++ * Checks if the PHY generated an interrupt.
++ * For multi-PHY devices with shared PHY interrupt pin
++ */
++ int (*did_interrupt)(struct phy_device *phydev);
++
++ /* Clears up any memory if needed */
++ void (*remove)(struct phy_device *phydev);
++
++ struct device_driver driver;
++};
++#define to_phy_driver(d) container_of(d, struct phy_driver, driver)
++
++#define PHY_ANY_ID "MATCH ANY PHY"
++#define PHY_ANY_UID 0xffffffff
++
++/* A Structure for boards to register fixups with the PHY Lib */
++struct phy_fixup {
++ struct list_head list;
++ char bus_id[20];
++ u32 phy_uid;
++ u32 phy_uid_mask;
++ int (*run)(struct phy_device *phydev);
++};
++
++/**
++ * phy_read - Convenience function for reading a given PHY register
++ * @phydev: the phy_device struct
++ * @regnum: register number to read
++ *
++ * NOTE: MUST NOT be called from interrupt context,
++ * because the bus read/write functions may wait for an interrupt
++ * to conclude the operation.
++ */
++static inline int phy_read(struct phy_device *phydev, u32 regnum)
++{
++ return mdiobus_read(phydev->bus, phydev->addr, regnum);
++}
++
++/**
++ * phy_write - Convenience function for writing a given PHY register
++ * @phydev: the phy_device struct
++ * @regnum: register number to write
++ * @val: value to write to @regnum
++ *
++ * NOTE: MUST NOT be called from interrupt context,
++ * because the bus read/write functions may wait for an interrupt
++ * to conclude the operation.
++ */
++static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val)
++{
++ return mdiobus_write(phydev->bus, phydev->addr, regnum, val);
++}
++
++int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id);
++struct phy_device* get_phy_device(struct mii_bus *bus, int addr);
++int phy_device_register(struct phy_device *phy);
++int phy_clear_interrupt(struct phy_device *phydev);
++int phy_config_interrupt(struct phy_device *phydev, u32 interrupts);
++int phy_init_hw(struct phy_device *phydev);
++int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
++ u32 flags, phy_interface_t interface);
++struct phy_device * phy_attach(struct net_device *dev,
++ const char *bus_id, u32 flags, phy_interface_t interface);
++struct phy_device *phy_find_first(struct mii_bus *bus);
++int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
++ void (*handler)(struct net_device *), u32 flags,
++ phy_interface_t interface);
++struct phy_device * phy_connect(struct net_device *dev, const char *bus_id,
++ void (*handler)(struct net_device *), u32 flags,
++ phy_interface_t interface);
++void phy_disconnect(struct phy_device *phydev);
++void phy_detach(struct phy_device *phydev);
++void phy_start(struct phy_device *phydev);
++void phy_stop(struct phy_device *phydev);
++int phy_start_aneg(struct phy_device *phydev);
++
++void phy_sanitize_settings(struct phy_device *phydev);
++int phy_stop_interrupts(struct phy_device *phydev);
++int phy_enable_interrupts(struct phy_device *phydev);
++int phy_disable_interrupts(struct phy_device *phydev);
++
++static inline int phy_read_status(struct phy_device *phydev) {
++ return phydev->drv->read_status(phydev);
++}
++
++int genphy_config_advert(struct phy_device *phydev);
++int genphy_setup_forced(struct phy_device *phydev);
++int genphy_restart_aneg(struct phy_device *phydev);
++int genphy_config_aneg(struct phy_device *phydev);
++int genphy_update_link(struct phy_device *phydev);
++int genphy_read_status(struct phy_device *phydev);
++int genphy_suspend(struct phy_device *phydev);
++int genphy_resume(struct phy_device *phydev);
++void phy_driver_unregister(struct phy_driver *drv);
++int phy_driver_register(struct phy_driver *new_driver);
++void phy_prepare_link(struct phy_device *phydev,
++ void (*adjust_link)(struct net_device *));
++void phy_state_machine(struct work_struct *work);
++void phy_start_machine(struct phy_device *phydev,
++ void (*handler)(struct net_device *));
++void phy_stop_machine(struct phy_device *phydev);
++int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
++int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
++int phy_mii_ioctl(struct phy_device *phydev,
++ struct mii_ioctl_data *mii_data, int cmd);
++int phy_start_interrupts(struct phy_device *phydev);
++void phy_print_status(struct phy_device *phydev);
++struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id);
++void phy_device_free(struct phy_device *phydev);
++
++int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
++ int (*run)(struct phy_device *));
++int phy_register_fixup_for_id(const char *bus_id,
++ int (*run)(struct phy_device *));
++int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,
++ int (*run)(struct phy_device *));
++int phy_scan_fixups(struct phy_device *phydev);
++
++int __init mdio_bus_init(void);
++void mdio_bus_exit(void);
++
++extern struct bus_type mdio_bus_type;
++#endif /* __PHY_H */
+diff -Nur linux-2.6.35.7.orig/include/linux/spi/vsc7385.h linux-2.6.35.7/include/linux/spi/vsc7385.h
+--- linux-2.6.35.7.orig/include/linux/spi/vsc7385.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/include/linux/spi/vsc7385.h 2010-10-14 20:28:01.878101023 +0200
@@ -0,0 +1,19 @@
+/*
+ * Platform data definition for the Vitesse VSC7385 ethernet switch driver
@@ -17495,9 +33048,9 @@ diff -Nur linux-2.6.34.orig/include/linux/spi/vsc7385.h linux-2.6.34/include/lin
+ u32 clk_sel:3;
+ } mac_cfg;
+};
-diff -Nur linux-2.6.34.orig/net/dsa/ar7240.c linux-2.6.34/net/dsa/ar7240.c
---- linux-2.6.34.orig/net/dsa/ar7240.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/net/dsa/ar7240.c 2010-05-25 18:46:13.583464107 +0200
+diff -Nur linux-2.6.35.7.orig/net/dsa/ar7240.c linux-2.6.35.7/net/dsa/ar7240.c
+--- linux-2.6.35.7.orig/net/dsa/ar7240.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/net/dsa/ar7240.c 2010-10-14 20:28:01.915601104 +0200
@@ -0,0 +1,736 @@
+/*
+ * DSA driver for the built-in ethernet switch of the Atheros AR7240 SoC
@@ -18235,9 +33788,9 @@ diff -Nur linux-2.6.34.orig/net/dsa/ar7240.c linux-2.6.34/net/dsa/ar7240.c
+ unregister_switch_driver(&ar7240_dsa_driver);
+}
+module_exit(dsa_ar7240_cleanup);
-diff -Nur linux-2.6.34.orig/net/dsa/mv88e6063.c linux-2.6.34/net/dsa/mv88e6063.c
---- linux-2.6.34.orig/net/dsa/mv88e6063.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/net/dsa/mv88e6063.c 2010-05-25 18:46:13.623464081 +0200
+diff -Nur linux-2.6.35.7.orig/net/dsa/mv88e6063.c linux-2.6.35.7/net/dsa/mv88e6063.c
+--- linux-2.6.35.7.orig/net/dsa/mv88e6063.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/net/dsa/mv88e6063.c 2010-10-14 20:28:01.954381749 +0200
@@ -0,0 +1,294 @@
+/*
+ * net/dsa/mv88e6063.c - Driver for Marvell 88e6063 switch chips
@@ -18533,9 +34086,9 @@ diff -Nur linux-2.6.34.orig/net/dsa/mv88e6063.c linux-2.6.34/net/dsa/mv88e6063.c
+ unregister_switch_driver(&mv88e6063_switch_driver);
+}
+module_exit(mv88e6063_cleanup);
-diff -Nur linux-2.6.34.orig/net/dsa/tag_qinq.c linux-2.6.34/net/dsa/tag_qinq.c
---- linux-2.6.34.orig/net/dsa/tag_qinq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/net/dsa/tag_qinq.c 2010-05-25 18:46:13.663473277 +0200
+diff -Nur linux-2.6.35.7.orig/net/dsa/tag_qinq.c linux-2.6.35.7/net/dsa/tag_qinq.c
+--- linux-2.6.35.7.orig/net/dsa/tag_qinq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/net/dsa/tag_qinq.c 2010-10-14 20:28:01.998101297 +0200
@@ -0,0 +1,127 @@
+/*
+ * net/dsa/tag_qinq.c - QinQ tag format handling