summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/include/mach/collie.h
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-05-13 07:53:34 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-05-13 07:53:34 +0900
commit163ec0369be4c26e68385f6cec88d0ee38c8d8e5 (patch)
treef3e441866f8bc1b0548e7d8eddd9548b6aedef5e /arch/arm/mach-sa1100/include/mach/collie.h
parent199642bfe107c411f25fbfc16c9fd49cfef9785d (diff)
parent99dbdd98f271899e023d52b3f4c2bf67cdd7eb56 (diff)
downloadblackbird-op-linux-163ec0369be4c26e68385f6cec88d0ee38c8d8e5.tar.gz
blackbird-op-linux-163ec0369be4c26e68385f6cec88d0ee38c8d8e5.zip
Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach/collie.h')
-rw-r--r--arch/arm/mach-sa1100/include/mach/collie.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h
index 52acda7061b7..f33679d2d3ee 100644
--- a/arch/arm/mach-sa1100/include/mach/collie.h
+++ b/arch/arm/mach-sa1100/include/mach/collie.h
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-sa1100/include/mach/collie.h
*
- * This file contains the hardware specific definitions for Assabet
+ * This file contains the hardware specific definitions for Collie
* Only include this file from SA1100-specific files.
*
* ChangeLog:
@@ -13,6 +13,7 @@
#ifndef __ASM_ARCH_COLLIE_H
#define __ASM_ARCH_COLLIE_H
+extern void locomolcd_power(int on);
#define COLLIE_SCOOP_GPIO_BASE (GPIO_MAX + 1)
#define COLLIE_GPIO_CHARGE_ON (COLLIE_SCOOP_GPIO_BASE + 0)
OpenPOWER on IntegriCloud