diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-21 13:50:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-21 13:50:33 -0500 |
| commit | efd0bf97deeddd9ba53daabfc470a1399c6b0b2d (patch) | |
| tree | eec56da5fbc796bac7c67f1990a18f5e0a304059 /arch/cris | |
| parent | f8a15af093b19b86d56933c8757cee298d0f32a8 (diff) | |
| parent | 6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.
The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.
Conflicts:
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/wireless/libertas/cfg.c
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v10/drivers/Kconfig | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 2 |
2 files changed, 2 insertions, 2 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 |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index e47e9c3401b0..de43aadcdbc4 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
| @@ -3,7 +3,7 @@ if ETRAX_ARCH_V32 | |||
| 3 | config ETRAX_ETHERNET | 3 | config ETRAX_ETHERNET |
| 4 | bool "Ethernet support" | 4 | bool "Ethernet support" |
| 5 | depends on ETRAX_ARCH_V32 | 5 | depends on ETRAX_ARCH_V32 |
| 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 |