diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:52:04 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:52:04 +1100 |
commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /drivers/staging/slicoss/Kconfig | |
parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'drivers/staging/slicoss/Kconfig')
-rw-r--r-- | drivers/staging/slicoss/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/staging/slicoss/Kconfig b/drivers/staging/slicoss/Kconfig new file mode 100644 index 00000000000..d2993d339bc --- /dev/null +++ b/drivers/staging/slicoss/Kconfig @@ -0,0 +1,14 @@ +config SLICOSS + tristate "Alacritech Gigabit IS-NIC support" + depends on PCI && X86 && NETDEV_1000 + default n + help + This driver supports Alacritech's IS-NIC gigabit ethernet cards. + + This includes the following devices: + Mojave cards (single port PCI Gigabit) both copper and fiber + Oasis cards (single and dual port PCI-x Gigabit) copper and fiber + Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber + + To compile this driver as a module, choose M here: the module + will be called slicoss. |