diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:07:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:07:48 -0500 |
| commit | 1f3f424a6bee9de4d839be9951f4296333fac014 (patch) | |
| tree | 95de90dfdb4a9f64fe470709b82176243537c952 /arch/ia64 | |
| parent | c8cae544bba6aee0f5cb0756dbab1a71d2c68737 (diff) | |
| parent | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/ia64')
| -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" | |||
| 4 | 4 | ||
| 5 | config HP_SIMETH | 5 | config HP_SIMETH |
| 6 | bool "Simulated Ethernet " | 6 | bool "Simulated Ethernet " |
| 7 | depends on NET | ||
| 7 | 8 | ||
| 8 | config HP_SIMSERIAL | 9 | config HP_SIMSERIAL |
| 9 | bool "Simulated serial driver support" | 10 | bool "Simulated serial driver support" |