diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-12 11:19:20 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-12 11:19:20 -0500 |
| commit | 68556ca1e03d6a35be3b315eba58df2f8176e3a0 (patch) | |
| tree | 36a390d29a0d03a59a90c0f223b0d98a80f0f6c3 /arch/cris/arch-v10 | |
| parent | 0604ca48f1689ad06144b81f5c08f297b6edd831 (diff) | |
| parent | 8ab30691826fc05efa47c4ffba19b80496bb3a2c (diff) | |
Merge branch 'mfd/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into for-3.3
Diffstat (limited to 'arch/cris/arch-v10')
| -rw-r--r-- | arch/cris/arch-v10/drivers/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index 32d90867a984..5f2cdb3e428c 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig | |||
| @@ -3,7 +3,7 @@ if ETRAX_ARCH_V10 | |||
| 3 | config ETRAX_ETHERNET | 3 | config ETRAX_ETHERNET |
| 4 | bool "Ethernet support" | 4 | bool "Ethernet support" |
| 5 | depends on ETRAX_ARCH_V10 | 5 | depends on ETRAX_ARCH_V10 |
| 6 | select NET_ETHERNET | 6 | select ETHERNET |
| 7 | select NET_CORE | 7 | select NET_CORE |
| 8 | select MII | 8 | select MII |
| 9 | help | 9 | help |