diff options
author | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
commit | c280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch) | |
tree | f8a89e593a0ba43b75bb666d8e245b2460dc0d40 /arch/ia64/hp | |
parent | eddce368f99b682683e09cf206eaa25131d40abe (diff) | |
parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
download | blackbird-op-linux-c280266a326ccabeb64b6d69fa4fd21faf5bf354.tar.gz blackbird-op-linux-c280266a326ccabeb64b6d69fa4fd21faf5bf354.zip |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'arch/ia64/hp')
-rw-r--r-- | arch/ia64/hp/sim/Kconfig | 1 |
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" |