Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 38 insertions, 38 deletions

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index b5d0d7fb647a..d5ab9cf13257 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -57,44 +57,6 @@ config COSA
           The driver will be compiled as a module: the
           module will be called cosa.
 
-config DSCC4
-        tristate "Etinc PCISYNC serial board support"
-        depends on WAN && PCI && m
-        help
-          Driver for Etinc PCISYNC boards based on the Infineon (ex. Siemens)
-          DSCC4 chipset.
-
-          This is supposed to work with the four port card. Take a look at
-          <http://www.cogenit.fr/dscc4/> for further information about the
-          driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called dscc4.
-
-config DSCC4_PCISYNC
-        bool "Etinc PCISYNC features"
-        depends on DSCC4
-        help
-          Due to Etinc's design choice for its PCISYNC cards, some operations
-          are only allowed on specific ports of the DSCC4. This option is the
-          only way for the driver to know that it shouldn't return a success
-          code for these operations.
-
-          Please say Y if your card is an Etinc's PCISYNC.
-
-config DSCC4_PCI_RST
-        bool "Hard reset support"
-        depends on DSCC4
-        help
-          Various DSCC4 bugs forbid any reliable software reset of the ASIC.
-          As a replacement, some vendors provide a way to assert the PCI #RST
-          pin of DSCC4 through the GPIO port of the card. If you choose Y,
-          the driver will make use of this feature before module removal
-          (i.e. rmmod). The feature is known to be available on Commtech's
-          cards. Contact your manufacturer for details.
-
-          Say Y if your card supports this feature.
-
 #
 # Lan Media's board. Currently 1000, 1200, 5200, 5245
 #
@@ -323,6 +285,44 @@ config FARSYNC
           To compile this driver as a module, choose M here: the
           module will be called farsync.
 
+config DSCC4
+        tristate "Etinc PCISYNC serial board support"
+        depends on HDLC && PCI && m
+        help
+          Driver for Etinc PCISYNC boards based on the Infineon (ex. Siemens)
+          DSCC4 chipset.
+
+          This is supposed to work with the four port card. Take a look at
+          <http://www.cogenit.fr/dscc4/> for further information about the
+          driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called dscc4.
+
+config DSCC4_PCISYNC
+        bool "Etinc PCISYNC features"
+        depends on DSCC4
+        help
+          Due to Etinc's design choice for its PCISYNC cards, some operations
+          are only allowed on specific ports of the DSCC4. This option is the
+          only way for the driver to know that it shouldn't return a success
+          code for these operations.
+
+          Please say Y if your card is an Etinc's PCISYNC.
+
+config DSCC4_PCI_RST
+        bool "Hard reset support"
+        depends on DSCC4
+        help
+          Various DSCC4 bugs forbid any reliable software reset of the ASIC.
+          As a replacement, some vendors provide a way to assert the PCI #RST
+          pin of DSCC4 through the GPIO port of the card. If you choose Y,
+          the driver will make use of this feature before module removal
+          (i.e. rmmod). The feature is known to be available on Commtech's
+          cards. Contact your manufacturer for details.
+
+          Say Y if your card supports this feature.
+
 config DLCI
         tristate "Frame Relay DLCI support"
         depends on WAN