diff options
author | Tony Luck <tony.luck@intel.com> | 2007-07-13 19:31:54 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-07-13 19:31:54 -0400 |
commit | 4f8de2745629330d78776282ea490fece22ee5e4 (patch) | |
tree | 7894af1fd84ff7b2e2542dcee337545b9887a318 /arch | |
parent | 829a9996259e4d0b20ce7b94c49b985d6ba6b760 (diff) |
[IA64] Clean away some code inside some non-existent CONFIG ifdefs
Robert P.J. Day has a script that finds places in the code that
use non-existent CONFIG variables. It complained of two uses in
ia64 specific code: CONFIG_IA64_SDV and CONFIG_KDB (both used in
the hp/sim code).
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/hp/sim/boot/fw-emu.c | 5 | ||||
-rw-r--r-- | arch/ia64/hp/sim/simserial.c | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/ia64/hp/sim/boot/fw-emu.c b/arch/ia64/hp/sim/boot/fw-emu.c index 300acd913d9c..1189d035d316 100644 --- a/arch/ia64/hp/sim/boot/fw-emu.c +++ b/arch/ia64/hp/sim/boot/fw-emu.c | |||
@@ -329,11 +329,6 @@ sys_fw_init (const char *args, int arglen) | |||
329 | strcpy(sal_systab->product_id, "HP-simulator"); | 329 | strcpy(sal_systab->product_id, "HP-simulator"); |
330 | #endif | 330 | #endif |
331 | 331 | ||
332 | #ifdef CONFIG_IA64_SDV | ||
333 | strcpy(sal_systab->oem_id, "Intel"); | ||
334 | strcpy(sal_systab->product_id, "SDV"); | ||
335 | #endif | ||
336 | |||
337 | /* fill in an entry point: */ | 332 | /* fill in an entry point: */ |
338 | sal_ed->type = SAL_DESC_ENTRY_POINT; | 333 | sal_ed->type = SAL_DESC_ENTRY_POINT; |
339 | sal_ed->pal_proc = __pa(pal_desc[0]); | 334 | sal_ed->pal_proc = __pa(pal_desc[0]); |
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 324ea7565e2c..ef252df50e1e 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
@@ -36,10 +36,6 @@ | |||
36 | #include <asm/hw_irq.h> | 36 | #include <asm/hw_irq.h> |
37 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
38 | 38 | ||
39 | #ifdef CONFIG_KDB | ||
40 | # include <linux/kdb.h> | ||
41 | #endif | ||
42 | |||
43 | #undef SIMSERIAL_DEBUG /* define this to get some debug information */ | 39 | #undef SIMSERIAL_DEBUG /* define this to get some debug information */ |
44 | 40 | ||
45 | #define KEYBOARD_INTR 3 /* must match with simulator! */ | 41 | #define KEYBOARD_INTR 3 /* must match with simulator! */ |