diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
| commit | 98793265b429a3f0b3f1750e74d67cd4d740d162 (patch) | |
| tree | b0bd717673f0c21845cf053f3fb6b75d42530af5 /arch/arm | |
| parent | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (diff) | |
| parent | bd1b2a555952d959f47169056fca05acf7eff81f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
Kconfig: acpi: Fix typo in comment.
misc latin1 to utf8 conversions
devres: Fix a typo in devm_kfree comment
btrfs: free-space-cache.c: remove extra semicolon.
fat: Spelling s/obsolate/obsolete/g
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
tools/power turbostat: update fields in manpage
mac80211: drop spelling fix
types.h: fix comment spelling for 'architectures'
typo fixes: aera -> area, exntension -> extension
devices.txt: Fix typo of 'VMware'.
sis900: Fix enum typo 'sis900_rx_bufer_status'
decompress_bunzip2: remove invalid vi modeline
treewide: Fix comment and string typo 'bufer'
hyper-v: Update MAINTAINERS
treewide: Fix typos in various parts of the kernel, and fix some comments.
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
leds: Kconfig: Fix typo 'D2NET_V2'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
...
Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa270-income.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/serial.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 444822526a07..f72e1707d463 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1140,10 +1140,9 @@ config IWMMXT | |||
| 1140 | Enable support for iWMMXt context switching at run time if | 1140 | Enable support for iWMMXt context switching at run time if |
| 1141 | running on a CPU that supports it. | 1141 | running on a CPU that supports it. |
| 1142 | 1142 | ||
| 1143 | # bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER | ||
| 1144 | config XSCALE_PMU | 1143 | config XSCALE_PMU |
| 1145 | bool | 1144 | bool |
| 1146 | depends on CPU_XSCALE && !XSCALE_PMU_TIMER | 1145 | depends on CPU_XSCALE |
| 1147 | default y | 1146 | default y |
| 1148 | 1147 | ||
| 1149 | config CPU_HAS_PMU | 1148 | config CPU_HAS_PMU |
diff --git a/arch/arm/mach-pxa/colibri-pxa270-income.c b/arch/arm/mach-pxa/colibri-pxa270-income.c index 80538b8806ed..248804bb2c9d 100644 --- a/arch/arm/mach-pxa/colibri-pxa270-income.c +++ b/arch/arm/mach-pxa/colibri-pxa270-income.c | |||
| @@ -183,7 +183,7 @@ static inline void income_lcd_init(void) {} | |||
| 183 | /****************************************************************************** | 183 | /****************************************************************************** |
| 184 | * Backlight | 184 | * Backlight |
| 185 | ******************************************************************************/ | 185 | ******************************************************************************/ |
| 186 | #if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM__MODULE) | 186 | #if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE) |
| 187 | static struct platform_pwm_backlight_data income_backlight_data = { | 187 | static struct platform_pwm_backlight_data income_backlight_data = { |
| 188 | .pwm_id = 0, | 188 | .pwm_id = 0, |
| 189 | .max_brightness = 0x3ff, | 189 | .max_brightness = 0x3ff, |
diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h index 1ab9fd6abe6d..ac44bde5d36d 100644 --- a/arch/arm/plat-omap/include/plat/serial.h +++ b/arch/arm/plat-omap/include/plat/serial.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * arch/arm/plat-omap/include/mach/serial.h | 2 | * arch/arm/plat-omap/include/mach/serial.h |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2009 Texas Instruments | 4 | * Copyright (C) 2009 Texas Instruments |
| 5 | * Addded OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com> | 5 | * Added OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com> |
| 6 | * | 6 | * |
| 7 | * This program is distributed in the hope that it will be useful, | 7 | * This program is distributed in the hope that it will be useful, |
| 8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |