clean-remove-gta02.h-from-printk-debug.patch
authorAndy Green <andy@openmoko.com>
Wed, 19 Nov 2008 17:11:13 +0000 (17:11 +0000)
committerAndy Green <andy@openmoko.com>
Wed, 19 Nov 2008 17:11:13 +0000 (17:11 +0000)
Signed-off-by: Andy Green <andy@openmoko.com>
drivers/serial/samsung.c
kernel/printk.c

index d27fc43..a1020ad 100644 (file)
 #include <mach/map.h>
 
 #include <plat/regs-serial.h>
+#ifdef CONFIG_MACH_NEO1973
 #include <mach/regs-gpio.h>
 #include <mach/regs-clock.h>
+#endif
 
 #include "samsung.h"
 
@@ -889,6 +891,7 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS
 #endif
 };
 
+#ifdef CONFIG_MACH_NEO1973_GTA02
 static void s3c24xx_serial_force_debug_port_up(void)
 {
        struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[
@@ -950,7 +953,7 @@ static void s3c2410_printascii(const char *sz)
                sz++;
        }
 }
-
+#endif
 
 /* s3c24xx_serial_resetport
  *
@@ -1252,11 +1255,12 @@ int s3c24xx_serial_init(struct platform_driver *drv,
                        struct s3c24xx_uart_info *info)
 {
        dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
-
+#ifdef CONFIG_MACH_NEO1973_GTA02
        /* set up the emergency debug UART functions */
 
        printk_emergency_debug_spew_init = s3c24xx_serial_force_debug_port_up;
        printk_emergency_debug_spew_send_string = s3c2410_printascii;
+#endif
 
 #ifdef CONFIG_PM
        drv->suspend = s3c24xx_serial_suspend;
index e9f03c0..5b75d0e 100644 (file)
@@ -37,7 +37,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/plat-s3c24xx/neo1973.h>
-#include <mach/gta02.h>
 
 /*
  * Architectures can override it:
@@ -677,7 +676,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
        /* Emit the output into the temporary buffer */
        printed_len += vscnprintf(printk_buf + printed_len,
                                  sizeof(printk_buf) - printed_len, fmt, args);
-
+#ifdef CONFIG_MACH_NEO1973_GTA02
        /* if you're debugging resume, the normal methods can change resume
         * ordering behaviours because their debugging output is synchronous
         * (ie, CONFIG_DEBUG_LL).  If your problem is an OOPS, this code
@@ -709,7 +708,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
                }
                (printk_emergency_debug_spew_send_string)(printk_buf);
        }
-
+#endif
        /*
         * Copy the output into log_buf.  If the caller didn't provide
         * appropriate log level tags, we insert them here