diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-05 18:20:17 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-05 18:20:17 -0500 |
| commit | 742eaa6a6e356a16788ce6530271de89bc4f8fb5 (patch) | |
| tree | 12fc040daab06ac796c61c1d92bfad9bb054d1c1 /arch/cris/arch-v10 | |
| parent | ba8bb18a03f8c7508565c385576a5431a4ad804a (diff) | |
| parent | ae72fd588a2b302222769b44775912b83f0785eb (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Conflicts:
arch/arm/common/gic.c
arch/arm/plat-omap/include/plat/common.h
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 32d90867a98..5f2cdb3e428 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 |