diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 09:16:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 09:16:56 -0700 |
| commit | 5a439c565799cb8d290d71ce375e86be64d43a4b (patch) | |
| tree | b7933dced01add02249af35f5497e77cd11dbfdf /drivers/net/Kconfig | |
| parent | 94b6da5ab8293b04a300ba35c72eddfa94db8b02 (diff) | |
| parent | 0025427eee4b5c005b4ac7a6489adc773e38611d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Add config files for Diamond 232L - Rev B processor variant
xtensa: Fix io regions
xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
xtensa: replace remaining __FUNCTION__ occurrences
xtensa: use newer __SPIN_LOCK_UNLOCKED macro
XTENSA: warn about including <asm/rwsem.h> directly.
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index a5a9c6da513..0b71ebc074b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -464,6 +464,12 @@ config MIPS_JAZZ_SONIC This is the driver for the onboard card of MIPS Magnum 4000, Acer PICA, Olivetti M700-10 and a few other identical OEM systems. +config XTENSA_XT2000_SONIC + tristate "Xtensa XT2000 onboard SONIC Ethernet support" + depends on XTENSA_PLATFORM_XT2000 + help + This is the driver for the onboard card of the Xtensa XT2000 board. + config MIPS_AU1X00_ENET bool "MIPS AU1000 Ethernet support" depends on SOC_AU1X00 |