aboutsummaryrefslogtreecommitdiff
path: root/drivers/serial
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-21 11:56:56 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-21 11:56:56 +0000
commitfffa54a4524f487c0fc438e2b210b2606015be7f (patch)
treec5682968902780ed9967a24ca4a2bc8b92d913a6 /drivers/serial
parenteaa7767d7f3257f8cae9268a521897fa0c98cfe8 (diff)
config-gta03-old-favourites.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/samsung.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index a1020ad9c79..c262eb1ae20 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -50,7 +50,7 @@
#include <mach/map.h>
#include <plat/regs-serial.h>
-#ifdef CONFIG_MACH_NEO1973
+#if defined(CONFIG_MACH_NEO1973) && !defined(CONFIG_CPU_S3C6410)
#include <mach/regs-gpio.h>
#include <mach/regs-clock.h>
#endif