Merge pobox.com:/spare/repo/linux-2.6

into pobox.com:/spare/repo/netdev-2.6/mv64340

drivers/net/Kconfig

@@ -2131,6 +2131,34 @@ config TIGON3
 	  To compile this driver as a module, choose M here: the module
 	  will be called tg3.  This is recommended.
 
+config MV64340_ETH
+	bool "MV-64340 Ethernet support"
+	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX
+	help
+	  This driver supports the gigabit Ethernet on the Marvell MV64340
+	  chipset which is used in the Momenco Ocelot C and Jaguar ATX.
+
+config MV64340_ETH_0
+	bool "MV-64340 Port 0"
+	depends on MV64340_ETH
+	help
+	  This enables support for Port 0 of the Marvell MV64340 Gigabit
+	  Ethernet.
+
+config MV64340_ETH_1
+	bool "MV-64340 Port 1"
+	depends on MV64340_ETH
+	help
+	  This enables support for Port 1 of the Marvell MV64340 Gigabit
+	  Ethernet.
+
+config MV64340_ETH_2
+	bool "MV-64340 Port 2"
+	depends on MV64340_ETH
+	help
+	  This enables support for Port 2 of the Marvell MV64340 Gigabit
+	  Ethernet.
+
 endmenu
 
 #

drivers/net/Makefile

@@ -95,6 +95,8 @@ obj-$(CONFIG_B44) += b44.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
 obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
 
+obj-$(CONFIG_MV64340_ETH) += mv64340_eth.o
+
 obj-$(CONFIG_PPP) += ppp_generic.o slhc.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
 obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o