diff options
author | Ingo Molnar | 2012-03-13 16:32:54 +0100 |
---|---|---|
committer | Ingo Molnar | 2012-03-13 16:33:03 +0100 |
commit | ef15eda98217f5183f457e7a2de8b79555ef908b (patch) | |
tree | f8f22b48f7bb237c9aa6646175f3e17eeac4af0e /drivers/net/ethernet/toshiba/Kconfig | |
parent | uprobes/core: Rename bkpt to swbp (diff) | |
parent | x86: Move is_ia32_task to asm/thread_info.h from asm/compat.h (diff) | |
download | kernel-qcow2-linux-ef15eda98217f5183f457e7a2de8b79555ef908b.tar.gz kernel-qcow2-linux-ef15eda98217f5183f457e7a2de8b79555ef908b.tar.xz kernel-qcow2-linux-ef15eda98217f5183f457e7a2de8b79555ef908b.zip |
Merge branch 'x86/cleanups' into perf/uprobes
Merge reason: We want to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/ethernet/toshiba/Kconfig')
-rw-r--r-- | drivers/net/ethernet/toshiba/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/toshiba/Kconfig b/drivers/net/ethernet/toshiba/Kconfig index 051764704559..74acb5cf6099 100644 --- a/drivers/net/ethernet/toshiba/Kconfig +++ b/drivers/net/ethernet/toshiba/Kconfig @@ -5,7 +5,7 @@ config NET_VENDOR_TOSHIBA bool "Toshiba devices" default y - depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) || PPC_PS3 + depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB || MIPS) || PPC_PS3 ---help--- If you have a network (Ethernet) card belonging to this class, say Y and read the Ethernet-HOWTO, available from |