Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4f8de2745629330d78776282ea490fece22ee5e4
Commit:     4f8de2745629330d78776282ea490fece22ee5e4
Parent:     829a9996259e4d0b20ce7b94c49b985d6ba6b760
Author:     Tony Luck <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 13 16:31:54 2007 -0700
Committer:  Tony Luck <[EMAIL PROTECTED]>
CommitDate: Fri Jul 13 16:31:54 2007 -0700

    [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 <[EMAIL PROTECTED]>
---
 arch/ia64/hp/sim/boot/fw-emu.c |    5 -----
 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 300acd9..1189d03 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)
        strcpy(sal_systab->product_id, "HP-simulator");
 #endif
 
-#ifdef CONFIG_IA64_SDV
-       strcpy(sal_systab->oem_id, "Intel");
-       strcpy(sal_systab->product_id, "SDV");
-#endif
-
        /* fill in an entry point: */
        sal_ed->type = SAL_DESC_ENTRY_POINT;
        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 324ea75..ef252df 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -36,10 +36,6 @@
 #include <asm/hw_irq.h>
 #include <asm/uaccess.h>
 
-#ifdef CONFIG_KDB
-# include <linux/kdb.h>
-#endif
-
 #undef SIMSERIAL_DEBUG /* define this to get some debug information */
 
 #define KEYBOARD_INTR  3       /* must match with simulator! */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to