Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / net / ethernet / micrel / Kconfig

diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
index 4227de6..d10c2e1 100644 (file)
--- a/drivers/net/ethernet/micrel/Kconfig
+++ b/drivers/net/ethernet/micrel/Kconfig
@@ -4,6 +4,7 @@
 
 config NET_VENDOR_MICREL
        bool "Micrel devices"
+       default y
        depends on (HAS_IOMEM && DMA_ENGINE) || SPI || PCI || HAS_IOMEM || \
                   (ARM && ARCH_KS8695)
        ---help---
@@ -21,6 +22,7 @@ if NET_VENDOR_MICREL
 config ARM_KS8695_ETHER
        tristate "KS8695 Ethernet support"
        depends on ARM && ARCH_KS8695
+       select NET_CORE
        select MII
        ---help---
          If you wish to compile a kernel for the KS8695 and want to
@@ -37,6 +39,7 @@ config KS8842
 config KS8851
        tristate "Micrel KS8851 SPI"
        depends on SPI
+       select NET_CORE
        select MII
        select CRC32
        ---help---
@@ -45,6 +48,7 @@ config KS8851
 config KS8851_MLL
        tristate "Micrel KS8851 MLL"
        depends on HAS_IOMEM
+       select NET_CORE
        select MII
        ---help---
          This platform driver is for Micrel KS8851 Address/data bus
@@ -53,6 +57,7 @@ config KS8851_MLL
 config KSZ884X_PCI
        tristate "Micrel KSZ8841/2 PCI"
        depends on PCI
+       select NET_CORE
        select MII
        select CRC32
        ---help---