summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorIngo Molnar2008-12-17 13:07:48 +0100
committerIngo Molnar2008-12-17 13:07:48 +0100
commit1f3f424a6bee9de4d839be9951f4296333fac014 (patch)
tree95de90dfdb4a9f64fe470709b82176243537c952 /arch/ia64
parentx86: fix build error with post-merge of tip/cpus4096 and rr-for-ingo/master. (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff)
downloadkernel-qcow2-linux-1f3f424a6bee9de4d839be9951f4296333fac014.tar.gz
kernel-qcow2-linux-1f3f424a6bee9de4d839be9951f4296333fac014.tar.xz
kernel-qcow2-linux-1f3f424a6bee9de4d839be9951f4296333fac014.zip
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/hp/sim/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/hp/sim/Kconfig b/arch/ia64/hp/sim/Kconfig
index f92306bbedb8..8d513a8c5266 100644
--- a/arch/ia64/hp/sim/Kconfig
+++ b/arch/ia64/hp/sim/Kconfig
@@ -4,6 +4,7 @@ menu "HP Simulator drivers"
config HP_SIMETH
bool "Simulated Ethernet "
+ depends on NET
config HP_SIMSERIAL
bool "Simulated serial driver support"