[PATCH] select CRC32

Use "select CRC32" in Kconfig instead of makefile includes.

drivers/media/dvb/dvb-core/Kconfig

 config DVB_CORE
 	tristate "DVB Core Support"
 	depends on DVB
+	select CRC32
 	help
 	  DVB core utility functions for device handling, software fallbacks etc.
 

drivers/media/dvb/dvb-core/Makefile.lib

-obj-$(CONFIG_DVB_CORE)		+= crc32.o

drivers/net/Makefile.lib

-# These drivers all require crc32.o
-obj-$(CONFIG_8139CP)		+= crc32.o
-obj-$(CONFIG_8139TOO)		+= crc32.o
-obj-$(CONFIG_A2065)		+= crc32.o
-obj-$(CONFIG_ARM_AM79C961A)	+= crc32.o
-obj-$(CONFIG_AT1700)		+= crc32.o
-obj-$(CONFIG_ATP)		+= crc32.o
-obj-$(CONFIG_BMAC)		+= crc32.o
-obj-$(CONFIG_DE2104X)		+= crc32.o
-obj-$(CONFIG_DE4X5)		+= crc32.o
-obj-$(CONFIG_DECLANCE)		+= crc32.o
-obj-$(CONFIG_DEPCA)		+= crc32.o
-obj-$(CONFIG_DL2K)		+= crc32.o
-obj-$(CONFIG_DM9102)		+= crc32.o
-obj-$(CONFIG_EPIC100)		+= crc32.o
-obj-$(CONFIG_EWRK3)		+= crc32.o
-obj-$(CONFIG_FEALNX)		+= crc32.o
-obj-$(CONFIG_HAPPYMEAL)		+= crc32.o
-obj-$(CONFIG_MACE)		+= crc32.o	
-obj-$(CONFIG_MACMACE)		+= crc32.o
-obj-$(CONFIG_MIPS_AU1000_ENET)	+= crc32.o
-obj-$(CONFIG_NATSEMI)		+= crc32.o	
-obj-$(CONFIG_NE2K_CBUS)		+= crc32.o
-obj-$(CONFIG_PCMCIA_FMVJ18X)	+= crc32.o
-obj-$(CONFIG_PCMCIA_SMC91C92)	+= crc32.o
-obj-$(CONFIG_PCMCIA_XIRTULIP)	+= crc32.o
-obj-$(CONFIG_PCNET32)		+= crc32.o
-obj-$(CONFIG_SGI_IOC3_ETH)	+= crc32.o
-obj-$(CONFIG_SIS190)		+= crc32.o
-obj-$(CONFIG_SIS900)		+= crc32.o
-obj-$(CONFIG_SMC9194)		+= crc32.o
-obj-$(CONFIG_ADAPTEC_STARFIRE)	+= crc32.o
-obj-$(CONFIG_SUNBMAC)		+= crc32.o
-obj-$(CONFIG_SUNDANCE)		+= crc32.o
-obj-$(CONFIG_SUNGEM)		+= crc32.o
-obj-$(CONFIG_SUNGEM)		+= crc32.o
-obj-$(CONFIG_SUNLANCE)		+= crc32.o
-obj-$(CONFIG_SUNQE)		+= crc32.o
-obj-$(CONFIG_TULIP)		+= crc32.o
-obj-$(CONFIG_TYPHOON)		+= crc32.o
-obj-$(CONFIG_VIA_RHINE)		+= crc32.o
-obj-$(CONFIG_YELLOWFIN)		+= crc32.o
-obj-$(CONFIG_WINBOND_840)	+= crc32.o
-obj-$(CONFIG_R8169)		+= crc32.o
-obj-$(CONFIG_AMD8111_ETH)	+= crc32.o
-
-
-# These rely on drivers/net/7990.o which requires crc32.o
-obj-$(CONFIG_HPLANCE)		+= crc32.o	
-obj-$(CONFIG_MVME147_NET)	+= crc32.o	
-
-
-# These rely on drivers/net/8390.o which requires crc32.o
-obj-$(CONFIG_OAKNET)		+= crc32.o
-obj-$(CONFIG_NE2K_PCI)		+= crc32.o
-obj-$(CONFIG_STNIC)		+= crc32.o
-obj-$(CONFIG_MAC8390)		+= crc32.o
-obj-$(CONFIG_APNE)		+= crc32.o
-obj-$(CONFIG_PCMCIA_PCNET)	+= crc32.o
-obj-$(CONFIG_ARM_ETHERH)	+= crc32.o
-obj-$(CONFIG_WD80x3)		+= crc32.o
-obj-$(CONFIG_EL2)		+= crc32.o
-obj-$(CONFIG_NE2000)		+= crc32.o
-obj-$(CONFIG_NE2_MCA)		+= crc32.o
-obj-$(CONFIG_HPLAN)		+= crc32.o
-obj-$(CONFIG_HPLAN_PLUS)	+= crc32.o
-obj-$(CONFIG_ULTRA)		+= crc32.o
-obj-$(CONFIG_ULTRAMCA)		+= crc32.o
-obj-$(CONFIG_ULTRA32)		+= crc32.o
-obj-$(CONFIG_E2100)		+= crc32.o
-obj-$(CONFIG_ES3210)		+= crc32.o
-obj-$(CONFIG_LNE390)		+= crc32.o
-obj-$(CONFIG_NE3210)		+= crc32.o
-obj-$(CONFIG_AC3200)		+= crc32.o
-obj-$(CONFIG_ZORRO8390)		+= crc32.o
-obj-$(CONFIG_HYDRA)		+= crc32.o

drivers/net/arm/Kconfig

@@ -5,6 +5,7 @@
 config ARM_AM79C961A
 	bool "ARM EBSA110 AM79C961A support"
 	depends on NET_ETHERNET && ARM && ARCH_EBSA110
+	select CRC32
 	help
 	  If you wish to compile a kernel for the EBSA-110, then you should
 	  always answer Y to this.
@@ -26,6 +27,7 @@ config ARM_ETHER3
 config ARM_ETHERH
 	tristate "I-cubed EtherH/ANT EtherM support"
 	depends on NET_ETHERNET && ARM && ARCH_ACORN
+	select CRC32
 	help
 	  If you have an Acorn system with one of these network cards, you
 	  should say Y to this option if you wish to use it with Linux.

drivers/net/pcmcia/Kconfig

@@ -44,6 +44,7 @@ config PCMCIA_3C574
 config PCMCIA_FMVJ18X
 	tristate "Fujitsu FMV-J18x PCMCIA support"
 	depends on NET_PCMCIA && PCMCIA
+	select CRC32
 	help
 	  Say Y here if you intend to attach a Fujitsu FMV-J18x or compatible
 	  PCMCIA (PC-card) Ethernet card to your computer.
@@ -54,6 +55,7 @@ config PCMCIA_FMVJ18X
 config PCMCIA_PCNET
 	tristate "NE2000 compatible PCMCIA support"
 	depends on NET_PCMCIA && PCMCIA
+	select CRC32
 	help
 	  Say Y here if you intend to attach an NE2000 compatible PCMCIA
 	  (PC-card) Ethernet or Fast Ethernet card to your computer.
@@ -74,6 +76,7 @@ config PCMCIA_NMCLAN
 config PCMCIA_SMC91C92
 	tristate "SMC 91Cxx PCMCIA support"
 	depends on NET_PCMCIA && PCMCIA
+	select CRC32
 	help
 	  Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
 	  (PC-card) Ethernet or Fast Ethernet card to your computer.

drivers/net/tulip/Kconfig

@@ -13,6 +13,7 @@ config NET_TULIP
 config DE2104X
 	tristate "Early DECchip Tulip (dc2104x) PCI support (EXPERIMENTAL)"
 	depends on NET_TULIP && PCI && EXPERIMENTAL
+	select CRC32
 	---help---
 	  This driver is developed for the SMC EtherPower series Ethernet
 	  cards and also works with cards based on the DECchip
@@ -30,6 +31,7 @@ config DE2104X
 config TULIP
 	tristate "DECchip Tulip (dc2114x) PCI support"
 	depends on NET_TULIP && PCI
+	select CRC32
 	---help---
 	  This driver is developed for the SMC EtherPower series Ethernet
 	  cards and also works with cards based on the DECchip 
@@ -69,6 +71,7 @@ config TULIP_MMIO
 config DE4X5
 	tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
 	depends on NET_TULIP && (PCI || EISA)
+	select CRC32
 	---help---
 	  This is support for the DIGITAL series of PCI/EISA Ethernet cards.
 	  These include the DE425, DE434, DE435, DE450 and DE500 models.  If
@@ -85,6 +88,7 @@ config DE4X5
 config WINBOND_840
 	tristate "Winbond W89c840 Ethernet support"
 	depends on NET_TULIP && PCI
+	select CRC32
 	help
 	  This driver is for the Winbond W89c840 chip.  It also works with 
 	  the TX9882 chip on the Compex RL100-ATX board.
@@ -94,6 +98,7 @@ config WINBOND_840
 config DM9102
 	tristate "Davicom DM910x/DM980x support"
 	depends on NET_TULIP && PCI
+	select CRC32
 	---help---
 	  This driver is for DM9102(A)/DM9132/DM9801 compatible PCI cards from
 	  Davicom (<http://www.davicom.com.tw/>).  If you have such a network
@@ -120,6 +125,7 @@ config PCMCIA_XIRCOM
 config PCMCIA_XIRTULIP
 	tristate "Xircom Tulip-like CardBus support (old driver)"
 	depends on NET_TULIP && CARDBUS && BROKEN_ON_SMP
+	select CRC32
 	---help---
 	  This driver is for the Digital "Tulip" Ethernet CardBus adapters.
 	  It should work with most DEC 21*4*-based chips/ethercards, as well

drivers/usb/Makefile.lib

-obj-$(CONFIG_USB_CATC)		+= crc32.o
-obj-$(CONFIG_USB_SPEEDTOUCH)	+= crc32.o
-obj-$(CONFIG_USB_USBNET)	+= crc32.o

drivers/usb/misc/Kconfig

@@ -84,6 +84,7 @@ config USB_LCD
 config USB_SPEEDTOUCH
 	tristate "Alcatel Speedtouch USB support"
 	depends on USB && ATM
+	select CRC32
 	help
 	  Say Y here if you have an Alcatel SpeedTouch USB or SpeedTouch 330
 	  modem.  In order to use your modem you will need to install some user

drivers/usb/net/Kconfig

@@ -10,6 +10,7 @@ comment "Networking support is needed for USB Networking device support"
 config USB_CATC
 	tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
 	depends on USB && NET && EXPERIMENTAL
+	select CRC32
 	---help---
 	  Say Y if you want to use one of the following 10Mbps USB Ethernet
 	  device based on the EL1210A chip. Supported devices are:
@@ -94,6 +95,7 @@ config USB_RTL8150
 config USB_USBNET
 	tristate "Multi-purpose USB Networking Framework"
 	depends on USB && NET
+	select CRC32
 	---help---
 	  This driver supports several kinds of network links over USB,
 	  with "minidrivers" built around a common network driver core

fs/Kconfig

@@ -1046,6 +1046,7 @@ config JFFS_PROC_FS
 config JFFS2_FS
 	tristate "Journalling Flash File System v2 (JFFS2) support"
 	depends on MTD
+	select CRC32
 	help
 	  JFFS2 is the second generation of the Journalling Flash File System
 	  for use on diskless embedded devices. It provides improved wear

fs/Makefile.lib

-obj-$(CONFIG_JFFS2_FS)		+= crc32.o
-obj-$(CONFIG_EFI_PARTITION)	+= crc32.o

fs/partitions/Kconfig

@@ -227,6 +227,7 @@ config SUN_PARTITION
 config EFI_PARTITION
 	bool "EFI GUID Partition support"
 	depends on PARTITION_ADVANCED
+	select CRC32
 	help
 	  Say Y here if you would like to use hard disks under Linux which
 	  were partitioned using EFI GPT.  Presently only useful on the

lib/Makefile

@@ -20,12 +20,6 @@ obj-$(CONFIG_CRC32)	+= crc32.o
 obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
 obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate/
 
-include drivers/net/Makefile.lib
-include drivers/usb/Makefile.lib
-include fs/Makefile.lib
-include net/bluetooth/bnep/Makefile.lib
-include drivers/media/dvb/dvb-core/Makefile.lib
-
 host-progs	:= gen_crc32table
 clean-files	:= crc32table.h
 

net/bluetooth/bnep/Kconfig

 config BT_BNEP
 	tristate "BNEP protocol support"
 	depends on BT && BT_L2CAP
+	select CRC32
 	help
 	  BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet
 	  emulation layer on top of Bluetooth. BNEP is required for Bluetooth

net/bluetooth/bnep/Makefile.lib

-obj-$(CONFIG_BT_BNEP) += crc32.o