diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
commit | d14b7a419a664cd7c1c585c9e7fffee9e9051d53 (patch) | |
tree | 42a1d5b61b58fa0a75252b082c4c6cef6fa9fd8d /arch | |
parent | e8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff) | |
parent | a58b3a4aba2fd5c445d9deccc73192bff48b591d (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Trivial updates all over the place as usual."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
Fix typo in include/linux/clk.h .
pci: hotplug: Fix typo in pci
iommu: Fix typo in iommu
video: Fix typo in drivers/video
Documentation: Add newline at end-of-file to files lacking one
arm,unicore32: Remove obsolete "select MISC_DEVICES"
module.c: spelling s/postition/position/g
cpufreq: Fix typo in cpufreq driver
trivial: typo in comment in mksysmap
mach-omap2: Fix typo in debug message and comment
scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
Change email address for Steve Glendinning
Btrfs: fix typo in convert_extent_bit
via: Remove bogus if check
netprio_cgroup.c: fix comment typo
backlight: fix memory leak on obscure error path
Documentation: asus-laptop.txt references an obsolete Kconfig item
Documentation: ManagementStyle: fixed typo
mm/vmscan: cleanup comment error in balance_pgdat
mm: cleanup on the comments of zone_reclaim_stat
...
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-davinci/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/sr_device.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/ia64_ksyms.c | 2 | ||||
-rw-r--r-- | arch/ia64/kvm/vmm.c | 6 | ||||
-rw-r--r-- | arch/m68k/kernel/module.c | 4 | ||||
-rw-r--r-- | arch/parisc/include/asm/compat_rt_sigframe.h | 6 | ||||
-rw-r--r-- | arch/sh/boards/board-polaris.c | 2 | ||||
-rw-r--r-- | arch/unicore32/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/kernel/module.c | 2 |
14 files changed, 17 insertions, 24 deletions
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 2ce1ef07c13d..ab99c3c3b752 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig | |||
@@ -62,7 +62,6 @@ config MACH_DAVINCI_EVM | |||
62 | bool "TI DM644x EVM" | 62 | bool "TI DM644x EVM" |
63 | default ARCH_DAVINCI_DM644x | 63 | default ARCH_DAVINCI_DM644x |
64 | depends on ARCH_DAVINCI_DM644x | 64 | depends on ARCH_DAVINCI_DM644x |
65 | select MISC_DEVICES | ||
66 | select EEPROM_AT24 | 65 | select EEPROM_AT24 |
67 | select I2C | 66 | select I2C |
68 | help | 67 | help |
@@ -72,7 +71,6 @@ config MACH_DAVINCI_EVM | |||
72 | config MACH_SFFSDR | 71 | config MACH_SFFSDR |
73 | bool "Lyrtech SFFSDR" | 72 | bool "Lyrtech SFFSDR" |
74 | depends on ARCH_DAVINCI_DM644x | 73 | depends on ARCH_DAVINCI_DM644x |
75 | select MISC_DEVICES | ||
76 | select EEPROM_AT24 | 74 | select EEPROM_AT24 |
77 | select I2C | 75 | select I2C |
78 | help | 76 | help |
@@ -106,7 +104,6 @@ config MACH_DAVINCI_DM6467_EVM | |||
106 | default ARCH_DAVINCI_DM646x | 104 | default ARCH_DAVINCI_DM646x |
107 | depends on ARCH_DAVINCI_DM646x | 105 | depends on ARCH_DAVINCI_DM646x |
108 | select MACH_DAVINCI_DM6467TEVM | 106 | select MACH_DAVINCI_DM6467TEVM |
109 | select MISC_DEVICES | ||
110 | select EEPROM_AT24 | 107 | select EEPROM_AT24 |
111 | select I2C | 108 | select I2C |
112 | help | 109 | help |
@@ -120,7 +117,6 @@ config MACH_DAVINCI_DM365_EVM | |||
120 | bool "TI DM365 EVM" | 117 | bool "TI DM365 EVM" |
121 | default ARCH_DAVINCI_DM365 | 118 | default ARCH_DAVINCI_DM365 |
122 | depends on ARCH_DAVINCI_DM365 | 119 | depends on ARCH_DAVINCI_DM365 |
123 | select MISC_DEVICES | ||
124 | select EEPROM_AT24 | 120 | select EEPROM_AT24 |
125 | select I2C | 121 | select I2C |
126 | help | 122 | help |
@@ -132,7 +128,6 @@ config MACH_DAVINCI_DA830_EVM | |||
132 | default ARCH_DAVINCI_DA830 | 128 | default ARCH_DAVINCI_DA830 |
133 | depends on ARCH_DAVINCI_DA830 | 129 | depends on ARCH_DAVINCI_DA830 |
134 | select GPIO_PCF857X | 130 | select GPIO_PCF857X |
135 | select MISC_DEVICES | ||
136 | select EEPROM_AT24 | 131 | select EEPROM_AT24 |
137 | select I2C | 132 | select I2C |
138 | help | 133 | help |
@@ -219,7 +214,6 @@ config MACH_TNETV107X | |||
219 | config MACH_MITYOMAPL138 | 214 | config MACH_MITYOMAPL138 |
220 | bool "Critical Link MityDSP-L138/MityARM-1808 SoM" | 215 | bool "Critical Link MityDSP-L138/MityARM-1808 SoM" |
221 | depends on ARCH_DAVINCI_DA850 | 216 | depends on ARCH_DAVINCI_DA850 |
222 | select MISC_DEVICES | ||
223 | select EEPROM_AT24 | 217 | select EEPROM_AT24 |
224 | select I2C | 218 | select I2C |
225 | help | 219 | help |
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 519bcd3079e8..e5fa46bfde2f 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -311,7 +311,7 @@ static void __init omap_apollon_init(void) | |||
311 | /* LCD PWR_EN */ | 311 | /* LCD PWR_EN */ |
312 | omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP); | 312 | omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP); |
313 | 313 | ||
314 | /* Use Interal loop-back in MMC/SDIO Module Input Clock selection */ | 314 | /* Use Internal loop-back in MMC/SDIO Module Input Clock selection */ |
315 | v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); | 315 | v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); |
316 | v |= (1 << 24); | 316 | v |= (1 << 24); |
317 | omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); | 317 | omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); |
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index b627cdc12b84..70f6d1d25463 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -106,7 +106,7 @@ static struct platform_device leds_gpio = { | |||
106 | static struct omap_abe_twl6040_data panda_abe_audio_data = { | 106 | static struct omap_abe_twl6040_data panda_abe_audio_data = { |
107 | /* Audio out */ | 107 | /* Audio out */ |
108 | .has_hs = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | 108 | .has_hs = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, |
109 | /* HandsFree through expasion connector */ | 109 | /* HandsFree through expansion connector */ |
110 | .has_hf = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | 110 | .has_hf = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, |
111 | /* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */ | 111 | /* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */ |
112 | .has_aux = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | 112 | .has_aux = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, |
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c index e35a86bf4e1d..637a1bdf2ac4 100644 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c | |||
@@ -313,7 +313,7 @@ int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state) | |||
313 | scu_pwrst_prepare(cpu, power_state); | 313 | scu_pwrst_prepare(cpu, power_state); |
314 | 314 | ||
315 | /* | 315 | /* |
316 | * CPU never retuns back if targetted power state is OFF mode. | 316 | * CPU never retuns back if targeted power state is OFF mode. |
317 | * CPU ONLINE follows normal CPU ONLINE ptah via | 317 | * CPU ONLINE follows normal CPU ONLINE ptah via |
318 | * omap_secondary_startup(). | 318 | * omap_secondary_startup(). |
319 | */ | 319 | */ |
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index e107e3915a8a..d033a65f4e4e 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c | |||
@@ -131,7 +131,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) | |||
131 | 131 | ||
132 | omap_voltage_get_volttable(sr_data->voltdm, &volt_data); | 132 | omap_voltage_get_volttable(sr_data->voltdm, &volt_data); |
133 | if (!volt_data) { | 133 | if (!volt_data) { |
134 | pr_warning("%s: No Voltage table registerd fo VDD%d." | 134 | pr_warning("%s: No Voltage table registered fo VDD%d." |
135 | "Something really wrong\n\n", __func__, i + 1); | 135 | "Something really wrong\n\n", __func__, i + 1); |
136 | goto exit; | 136 | goto exit; |
137 | } | 137 | } |
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 3882f3c7608c..de47f170ba50 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
@@ -96,7 +96,7 @@ void __init omap4_pmic_init(const char *pmic_type, | |||
96 | 96 | ||
97 | void __init omap_pmic_late_init(void) | 97 | void __init omap_pmic_late_init(void) |
98 | { | 98 | { |
99 | /* Init the OMAP TWL parameters (if PMIC has been registerd) */ | 99 | /* Init the OMAP TWL parameters (if PMIC has been registered) */ |
100 | if (pmic_i2c_board_info.irq) | 100 | if (pmic_i2c_board_info.irq) |
101 | omap3_twl_init(); | 101 | omap3_twl_init(); |
102 | if (omap4_i2c1_board_info[0].irq) | 102 | if (omap4_i2c1_board_info[0].irq) |
diff --git a/arch/arm/plat-samsung/include/plat/gpio-cfg.h b/arch/arm/plat-samsung/include/plat/gpio-cfg.h index df8155b9d4d1..08740eed050c 100644 --- a/arch/arm/plat-samsung/include/plat/gpio-cfg.h +++ b/arch/arm/plat-samsung/include/plat/gpio-cfg.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #ifndef __PLAT_GPIO_CFG_H | 24 | #ifndef __PLAT_GPIO_CFG_H |
25 | #define __PLAT_GPIO_CFG_H __FILE__ | 25 | #define __PLAT_GPIO_CFG_H __FILE__ |
26 | 26 | ||
27 | #include<linux/types.h> | 27 | #include <linux/types.h> |
28 | 28 | ||
29 | typedef unsigned int __bitwise__ samsung_gpio_pull_t; | 29 | typedef unsigned int __bitwise__ samsung_gpio_pull_t; |
30 | typedef unsigned int __bitwise__ s5p_gpio_drvstr_t; | 30 | typedef unsigned int __bitwise__ s5p_gpio_drvstr_t; |
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c index 7f4a0ed24152..5b7791dd3965 100644 --- a/arch/ia64/kernel/ia64_ksyms.c +++ b/arch/ia64/kernel/ia64_ksyms.c | |||
@@ -12,7 +12,7 @@ EXPORT_SYMBOL(memset); | |||
12 | EXPORT_SYMBOL(memcpy); | 12 | EXPORT_SYMBOL(memcpy); |
13 | EXPORT_SYMBOL(strlen); | 13 | EXPORT_SYMBOL(strlen); |
14 | 14 | ||
15 | #include<asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
16 | EXPORT_SYMBOL_GPL(empty_zero_page); | 16 | EXPORT_SYMBOL_GPL(empty_zero_page); |
17 | 17 | ||
18 | #include <asm/checksum.h> | 18 | #include <asm/checksum.h> |
diff --git a/arch/ia64/kvm/vmm.c b/arch/ia64/kvm/vmm.c index f0b9cac82414..176a12cd56de 100644 --- a/arch/ia64/kvm/vmm.c +++ b/arch/ia64/kvm/vmm.c | |||
@@ -20,9 +20,9 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | 22 | ||
23 | #include<linux/kernel.h> | 23 | #include <linux/kernel.h> |
24 | #include<linux/module.h> | 24 | #include <linux/module.h> |
25 | #include<asm/fpswa.h> | 25 | #include <asm/fpswa.h> |
26 | 26 | ||
27 | #include "vcpu.h" | 27 | #include "vcpu.h" |
28 | 28 | ||
diff --git a/arch/m68k/kernel/module.c b/arch/m68k/kernel/module.c index 34849c4c6e3d..eb46fd6038ca 100644 --- a/arch/m68k/kernel/module.c +++ b/arch/m68k/kernel/module.c | |||
@@ -47,7 +47,7 @@ int apply_relocate(Elf32_Shdr *sechdrs, | |||
47 | *location += sym->st_value; | 47 | *location += sym->st_value; |
48 | break; | 48 | break; |
49 | case R_68K_PC32: | 49 | case R_68K_PC32: |
50 | /* Add the value, subtract its postition */ | 50 | /* Add the value, subtract its position */ |
51 | *location += sym->st_value - (uint32_t)location; | 51 | *location += sym->st_value - (uint32_t)location; |
52 | break; | 52 | break; |
53 | default: | 53 | default: |
@@ -87,7 +87,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
87 | *location = rel[i].r_addend + sym->st_value; | 87 | *location = rel[i].r_addend + sym->st_value; |
88 | break; | 88 | break; |
89 | case R_68K_PC32: | 89 | case R_68K_PC32: |
90 | /* Add the value, subtract its postition */ | 90 | /* Add the value, subtract its position */ |
91 | *location = rel[i].r_addend + sym->st_value - (uint32_t)location; | 91 | *location = rel[i].r_addend + sym->st_value - (uint32_t)location; |
92 | break; | 92 | break; |
93 | default: | 93 | default: |
diff --git a/arch/parisc/include/asm/compat_rt_sigframe.h b/arch/parisc/include/asm/compat_rt_sigframe.h index 81bec28bdc48..b3f95a7f18b4 100644 --- a/arch/parisc/include/asm/compat_rt_sigframe.h +++ b/arch/parisc/include/asm/compat_rt_sigframe.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #include<linux/compat.h> | 1 | #include <linux/compat.h> |
2 | #include<linux/compat_siginfo.h> | 2 | #include <linux/compat_siginfo.h> |
3 | #include<asm/compat_ucontext.h> | 3 | #include <asm/compat_ucontext.h> |
4 | 4 | ||
5 | #ifndef _ASM_PARISC_COMPAT_RT_SIGFRAME_H | 5 | #ifndef _ASM_PARISC_COMPAT_RT_SIGFRAME_H |
6 | #define _ASM_PARISC_COMPAT_RT_SIGFRAME_H | 6 | #define _ASM_PARISC_COMPAT_RT_SIGFRAME_H |
diff --git a/arch/sh/boards/board-polaris.c b/arch/sh/boards/board-polaris.c index 37d03c097ae9..0978ae2e4847 100644 --- a/arch/sh/boards/board-polaris.c +++ b/arch/sh/boards/board-polaris.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * June 2006 steve.glendinning@smsc.com | 2 | * June 2006 Steve Glendinning <steve.glendinning@shawell.net> |
3 | * | 3 | * |
4 | * Polaris-specific resource declaration | 4 | * Polaris-specific resource declaration |
5 | * | 5 | * |
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 03c9ff808b5a..b0a47433341e 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig | |||
@@ -238,7 +238,6 @@ config I2C_BATTERY_BQ27200 | |||
238 | config I2C_EEPROM_AT24 | 238 | config I2C_EEPROM_AT24 |
239 | tristate "I2C EEPROMs AT24 support" | 239 | tristate "I2C EEPROMs AT24 support" |
240 | select I2C_PUV3 | 240 | select I2C_PUV3 |
241 | select MISC_DEVICES | ||
242 | select EEPROM_AT24 | 241 | select EEPROM_AT24 |
243 | 242 | ||
244 | config LCD_BACKLIGHT | 243 | config LCD_BACKLIGHT |
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index 202494d2ec6e..216a4d754b0c 100644 --- a/arch/x86/kernel/module.c +++ b/arch/x86/kernel/module.c | |||
@@ -81,7 +81,7 @@ int apply_relocate(Elf32_Shdr *sechdrs, | |||
81 | *location += sym->st_value; | 81 | *location += sym->st_value; |
82 | break; | 82 | break; |
83 | case R_386_PC32: | 83 | case R_386_PC32: |
84 | /* Add the value, subtract its postition */ | 84 | /* Add the value, subtract its position */ |
85 | *location += sym->st_value - (uint32_t)location; | 85 | *location += sym->st_value - (uint32_t)location; |
86 | break; | 86 | break; |
87 | default: | 87 | default: |