aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig3
-rw-r--r--arch/arm/mach-pxa/corgi_ssp.c2
-rw-r--r--arch/arm/mach-sa1100/collie_pm.c2
-rw-r--r--arch/arm/plat-s3c24xx/irq.c2
4 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 36176f40dfdf..471637002e8b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -635,8 +635,7 @@ config SMP
635 processor machines. On a single processor machine, the kernel will 635 processor machines. On a single processor machine, the kernel will
636 run faster if you say N here. 636 run faster if you say N here.
637 637
638 See also the <file:Documentation/smp.txt>, 638 See also <file:Documentation/i386/IO-APIC.txt>,
639 <file:Documentation/i386/IO-APIC.txt>,
640 <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at 639 <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
641 <http://www.linuxdoc.org/docs.html#howto>. 640 <http://www.linuxdoc.org/docs.html#howto>.
642 641
diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c
index efba65edcd51..31706224a04c 100644
--- a/arch/arm/mach-pxa/corgi_ssp.c
+++ b/arch/arm/mach-pxa/corgi_ssp.c
@@ -32,7 +32,7 @@ static struct corgissp_machinfo *ssp_machinfo;
32/* 32/*
33 * There are three devices connected to the SSP interface: 33 * There are three devices connected to the SSP interface:
34 * 1. A touchscreen controller (TI ADS7846 compatible) 34 * 1. A touchscreen controller (TI ADS7846 compatible)
35 * 2. An LCD contoller (with some Backlight functionality) 35 * 2. An LCD controller (with some Backlight functionality)
36 * 3. A battery monitoring IC (Maxim MAX1111) 36 * 3. A battery monitoring IC (Maxim MAX1111)
37 * 37 *
38 * Each device uses a different speed/mode of communication. 38 * Each device uses a different speed/mode of communication.
diff --git a/arch/arm/mach-sa1100/collie_pm.c b/arch/arm/mach-sa1100/collie_pm.c
index 1e25b1d19fce..94620be7bfac 100644
--- a/arch/arm/mach-sa1100/collie_pm.c
+++ b/arch/arm/mach-sa1100/collie_pm.c
@@ -165,7 +165,7 @@ int collie_read_temp(void)
165 165
166 ucb1x00_adc_enable(ucb); 166 ucb1x00_adc_enable(ucb);
167 ucb1x00_io_write(ucb, COLLIE_TC35143_GPIO_TMP_ON, 0); 167 ucb1x00_io_write(ucb, COLLIE_TC35143_GPIO_TMP_ON, 0);
168 /* >1010 = battery removed, 460 = 22C ?, higer = lower temp ? */ 168 /* >1010 = battery removed, 460 = 22C ?, higher = lower temp ? */
169 voltage = ucb1x00_adc_read(ucb, UCB_ADC_INP_AD0, UCB_SYNC); 169 voltage = ucb1x00_adc_read(ucb, UCB_ADC_INP_AD0, UCB_SYNC);
170 ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_TMP_ON); 170 ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_TMP_ON);
171 ucb1x00_adc_disable(ucb); 171 ucb1x00_adc_disable(ucb);
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
index d486f5112569..ae2c5d7efc9d 100644
--- a/arch/arm/plat-s3c24xx/irq.c
+++ b/arch/arm/plat-s3c24xx/irq.c
@@ -47,7 +47,7 @@
47 * Mark IRQ_LCD valid 47 * Mark IRQ_LCD valid
48 * 48 *
49 * 25-Jul-2005 Ben Dooks 49 * 25-Jul-2005 Ben Dooks
50 * Split the S3C2440 IRQ code to seperate file 50 * Split the S3C2440 IRQ code to separate file
51*/ 51*/
52 52
53#include <linux/init.h> 53#include <linux/init.h>