aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-s3c2410/mach-gta01.c4
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c4
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_pm_gsm.c5
-rw-r--r--drivers/video/backlight/gta01_bl.c2
4 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index e22381cb7bc..97f3d97ed4d 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -73,6 +73,8 @@
#include <asm/plat-s3c24xx/pm.h>
#include <asm/plat-s3c24xx/udc.h>
#include <asm/plat-s3c24xx/neo1973.h>
+#include <asm/arch-s3c2410/neo1973-pm-gsm.h>
+
#include <linux/jbt6k74.h>
static struct map_desc gta01_iodesc[] __initdata = {
@@ -666,8 +668,6 @@ static void __init gta01_map_io(void)
s3c24xx_init_uarts(gta01_uartcfgs, ARRAY_SIZE(gta01_uartcfgs));
}
-extern int gta_gsm_interrupts;
-
static irqreturn_t gta01_modem_irq(int irq, void *param)
{
printk(KERN_DEBUG "GSM wakeup interrupt (IRQ %d)\n", irq);
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 32854f68398..fbfb9cb6641 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -77,6 +77,8 @@
#include <asm/plat-s3c24xx/pm.h>
#include <asm/plat-s3c24xx/udc.h>
#include <asm/plat-s3c24xx/neo1973.h>
+#include <asm/arch-s3c2410/neo1973-pm-gsm.h>
+
#include <linux/jbt6k74.h>
#include <linux/glamofb.h>
@@ -1532,8 +1534,6 @@ static void __init gta02_map_io(void)
s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
}
-extern int gta_gsm_interrupts;
-
static irqreturn_t gta02_modem_irq(int irq, void *param)
{
printk(KERN_DEBUG "modem wakeup interrupt\n");
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
index 2d4fd617376..cb064acf6de 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
@@ -23,6 +23,7 @@
#include <asm/mach-types.h>
#include <asm/arch/gta01.h>
#include <asm/plat-s3c24xx/neo1973.h>
+#include <asm/arch/s3c24xx-serial.h>
#ifdef CONFIG_MACH_NEO1973_GTA02
#include <asm/arch/gta02.h>
@@ -30,10 +31,6 @@
#include <asm/arch/regs-gpioj.h>
#endif
-extern void s3c24xx_serial_console_set_silence(int silence);
-extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
- resume_dependency, int uart_index);
-
int gta_gsm_interrupts;
EXPORT_SYMBOL(gta_gsm_interrupts);
diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
index 34c19c8bf47..a7170dffc7b 100644
--- a/drivers/video/backlight/gta01_bl.c
+++ b/drivers/video/backlight/gta01_bl.c
@@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(gta01bl_deferred_resume);
static int gta01bl_resume(struct platform_device *dev)
{
- if (! gta01bl_defer_resume_backlight)
+ if (!gta01bl_defer_resume_backlight)
gta01bl_deferred_resume();
return 0;
}