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 | |
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
...
79 files changed, 119 insertions, 121 deletions
diff --git a/Documentation/ABI/stable/vdso b/Documentation/ABI/stable/vdso index 8a1cbb59449..7cdfc28cc2c 100644 --- a/Documentation/ABI/stable/vdso +++ b/Documentation/ABI/stable/vdso | |||
@@ -24,4 +24,4 @@ though. | |||
24 | 24 | ||
25 | (As of this writing, this ABI documentation as been confirmed for x86_64. | 25 | (As of this writing, this ABI documentation as been confirmed for x86_64. |
26 | The maintainers of the other vDSO-using architectures should confirm | 26 | The maintainers of the other vDSO-using architectures should confirm |
27 | that it is correct for their architecture.) \ No newline at end of file | 27 | that it is correct for their architecture.) |
diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI/testing/sysfs-block-zram index c8b3b48ec62..ec93fe33baa 100644 --- a/Documentation/ABI/testing/sysfs-block-zram +++ b/Documentation/ABI/testing/sysfs-block-zram | |||
@@ -96,4 +96,4 @@ Description: | |||
96 | overhead, allocated for this disk. So, allocator space | 96 | overhead, allocated for this disk. So, allocator space |
97 | efficiency can be calculated using compr_data_size and this | 97 | efficiency can be calculated using compr_data_size and this |
98 | statistic. | 98 | statistic. |
99 | Unit: bytes \ No newline at end of file | 99 | Unit: bytes |
diff --git a/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg b/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg index cb830df8777..70d00dfa443 100644 --- a/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg +++ b/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg | |||
@@ -40,4 +40,4 @@ Description: Controls the decimal places on the device. | |||
40 | the value of 10 ** n. Assume this field has | 40 | the value of 10 ** n. Assume this field has |
41 | the value k and has 1 or more decimal places set, | 41 | the value k and has 1 or more decimal places set, |
42 | to set the mth place (where m is not already set), | 42 | to set the mth place (where m is not already set), |
43 | change this fields value to k + 10 ** m. \ No newline at end of file | 43 | change this fields value to k + 10 ** m. |
diff --git a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 index 4a9c545bda4..33e64880811 100644 --- a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 +++ b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 | |||
@@ -53,4 +53,4 @@ Description: | |||
53 | Documentation/ABI/stable/sysfs-class-backlight. | 53 | Documentation/ABI/stable/sysfs-class-backlight. |
54 | It can be enabled by writing the value stored in | 54 | It can be enabled by writing the value stored in |
55 | /sys/class/backlight/<backlight>/max_brightness to | 55 | /sys/class/backlight/<backlight>/max_brightness to |
56 | /sys/class/backlight/<backlight>/brightness. \ No newline at end of file | 56 | /sys/class/backlight/<backlight>/brightness. |
diff --git a/Documentation/ManagementStyle b/Documentation/ManagementStyle index a5f0ea58c78..a211ee8d8b4 100644 --- a/Documentation/ManagementStyle +++ b/Documentation/ManagementStyle | |||
@@ -178,7 +178,7 @@ sadly that you are one too, and that while we can all bask in the secure | |||
178 | knowledge that we're better than the average person (let's face it, | 178 | knowledge that we're better than the average person (let's face it, |
179 | nobody ever believes that they're average or below-average), we should | 179 | nobody ever believes that they're average or below-average), we should |
180 | also admit that we're not the sharpest knife around, and there will be | 180 | also admit that we're not the sharpest knife around, and there will be |
181 | other people that are less of an idiot that you are. | 181 | other people that are less of an idiot than you are. |
182 | 182 | ||
183 | Some people react badly to smart people. Others take advantage of them. | 183 | Some people react badly to smart people. Others take advantage of them. |
184 | 184 | ||
diff --git a/Documentation/arm/Samsung-S3C24XX/H1940.txt b/Documentation/arm/Samsung-S3C24XX/H1940.txt index f4a7b22c866..b738859b1fc 100644 --- a/Documentation/arm/Samsung-S3C24XX/H1940.txt +++ b/Documentation/arm/Samsung-S3C24XX/H1940.txt | |||
@@ -37,4 +37,4 @@ Maintainers | |||
37 | Thanks to the many others who have also provided support. | 37 | Thanks to the many others who have also provided support. |
38 | 38 | ||
39 | 39 | ||
40 | (c) 2005 Ben Dooks \ No newline at end of file | 40 | (c) 2005 Ben Dooks |
diff --git a/Documentation/arm/Samsung-S3C24XX/SMDK2440.txt b/Documentation/arm/Samsung-S3C24XX/SMDK2440.txt index 32e1eae6a25..429390bd468 100644 --- a/Documentation/arm/Samsung-S3C24XX/SMDK2440.txt +++ b/Documentation/arm/Samsung-S3C24XX/SMDK2440.txt | |||
@@ -53,4 +53,4 @@ Maintainers | |||
53 | and to Simtec Electronics for allowing me time to work on this. | 53 | and to Simtec Electronics for allowing me time to work on this. |
54 | 54 | ||
55 | 55 | ||
56 | (c) 2004 Ben Dooks \ No newline at end of file | 56 | (c) 2004 Ben Dooks |
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index 47a154f3029..b6251cca926 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt | |||
@@ -2416,6 +2416,8 @@ Your cooperation is appreciated. | |||
2416 | 1 = /dev/raw/raw1 First raw I/O device | 2416 | 1 = /dev/raw/raw1 First raw I/O device |
2417 | 2 = /dev/raw/raw2 Second raw I/O device | 2417 | 2 = /dev/raw/raw2 Second raw I/O device |
2418 | ... | 2418 | ... |
2419 | max minor number of raw device is set by kernel config | ||
2420 | MAX_RAW_DEVS or raw module parameter 'max_raw_devs' | ||
2419 | 2421 | ||
2420 | 163 char | 2422 | 163 char |
2421 | 2423 | ||
diff --git a/Documentation/laptops/asus-laptop.txt b/Documentation/laptops/asus-laptop.txt index a1e04d67928..69f9fb3701e 100644 --- a/Documentation/laptops/asus-laptop.txt +++ b/Documentation/laptops/asus-laptop.txt | |||
@@ -151,8 +151,7 @@ Display switching | |||
151 | 151 | ||
152 | Debugging: | 152 | Debugging: |
153 | 1) Check whether the Fn+F8 key: | 153 | 1) Check whether the Fn+F8 key: |
154 | a) does not lock the laptop (try disabling CONFIG_X86_UP_APIC or boot with | 154 | a) does not lock the laptop (try a boot with noapic / nolapic if it does) |
155 | noapic / nolapic if it does) | ||
156 | b) generates events (0x6n, where n is the value corresponding to the | 155 | b) generates events (0x6n, where n is the value corresponding to the |
157 | configuration above) | 156 | configuration above) |
158 | c) actually works | 157 | c) actually works |
diff --git a/Documentation/sound/alsa/hdspm.txt b/Documentation/sound/alsa/hdspm.txt index 7a67ff71a9f..7ba31948dea 100644 --- a/Documentation/sound/alsa/hdspm.txt +++ b/Documentation/sound/alsa/hdspm.txt | |||
@@ -359,4 +359,4 @@ Calling Parameter: | |||
359 | enable_monitor int array (min = 1, max = 8), | 359 | enable_monitor int array (min = 1, max = 8), |
360 | "Enable Analog Out on Channel 63/64 by default." | 360 | "Enable Analog Out on Channel 63/64 by default." |
361 | 361 | ||
362 | note: here the analog output is enabled (but not routed). \ No newline at end of file | 362 | note: here the analog output is enabled (but not routed). |
diff --git a/Documentation/video4linux/cpia2_overview.txt b/Documentation/video4linux/cpia2_overview.txt index a6e53665216..ad6adbedfe5 100644 --- a/Documentation/video4linux/cpia2_overview.txt +++ b/Documentation/video4linux/cpia2_overview.txt | |||
@@ -35,4 +35,4 @@ the camera. There are three modes for this. Block mode requests a number | |||
35 | of contiguous registers. Random mode reads or writes random registers with | 35 | of contiguous registers. Random mode reads or writes random registers with |
36 | a tuple structure containing address/value pairs. The repeat mode is only | 36 | a tuple structure containing address/value pairs. The repeat mode is only |
37 | used by VP4 to load a firmware patch. It contains a starting address and | 37 | used by VP4 to load a firmware patch. It contains a starting address and |
38 | a sequence of bytes to be written into a gpio port. \ No newline at end of file | 38 | a sequence of bytes to be written into a gpio port. |
diff --git a/Documentation/video4linux/stv680.txt b/Documentation/video4linux/stv680.txt index 4f8946f32f5..e3de3364530 100644 --- a/Documentation/video4linux/stv680.txt +++ b/Documentation/video4linux/stv680.txt | |||
@@ -50,4 +50,4 @@ The latest info on this driver can be found at: | |||
50 | http://personal.clt.bellsouth.net/~kjsisson or at | 50 | http://personal.clt.bellsouth.net/~kjsisson or at |
51 | http://stv0680-usb.sourceforge.net | 51 | http://stv0680-usb.sourceforge.net |
52 | 52 | ||
53 | Any questions to me can be send to: kjsisson@bellsouth.net \ No newline at end of file | 53 | Any questions to me can be send to: kjsisson@bellsouth.net |
diff --git a/MAINTAINERS b/MAINTAINERS index 04ea1f23756..0ed7048352b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6242,9 +6242,9 @@ F: Documentation/hwmon/smm665 | |||
6242 | F: drivers/hwmon/smm665.c | 6242 | F: drivers/hwmon/smm665.c |
6243 | 6243 | ||
6244 | SMSC EMC2103 HARDWARE MONITOR DRIVER | 6244 | SMSC EMC2103 HARDWARE MONITOR DRIVER |
6245 | M: Steve Glendinning <steve.glendinning@smsc.com> | 6245 | M: Steve Glendinning <steve.glendinning@shawell.net> |
6246 | L: lm-sensors@lm-sensors.org | 6246 | L: lm-sensors@lm-sensors.org |
6247 | S: Supported | 6247 | S: Maintained |
6248 | F: Documentation/hwmon/emc2103 | 6248 | F: Documentation/hwmon/emc2103 |
6249 | F: drivers/hwmon/emc2103.c | 6249 | F: drivers/hwmon/emc2103.c |
6250 | 6250 | ||
@@ -6263,22 +6263,22 @@ F: Documentation/hwmon/smsc47b397 | |||
6263 | F: drivers/hwmon/smsc47b397.c | 6263 | F: drivers/hwmon/smsc47b397.c |
6264 | 6264 | ||
6265 | SMSC911x ETHERNET DRIVER | 6265 | SMSC911x ETHERNET DRIVER |
6266 | M: Steve Glendinning <steve.glendinning@smsc.com> | 6266 | M: Steve Glendinning <steve.glendinning@shawell.net> |
6267 | L: netdev@vger.kernel.org | 6267 | L: netdev@vger.kernel.org |
6268 | S: Supported | 6268 | S: Maintained |
6269 | F: include/linux/smsc911x.h | 6269 | F: include/linux/smsc911x.h |
6270 | F: drivers/net/ethernet/smsc/smsc911x.* | 6270 | F: drivers/net/ethernet/smsc/smsc911x.* |
6271 | 6271 | ||
6272 | SMSC9420 PCI ETHERNET DRIVER | 6272 | SMSC9420 PCI ETHERNET DRIVER |
6273 | M: Steve Glendinning <steve.glendinning@smsc.com> | 6273 | M: Steve Glendinning <steve.glendinning@shawell.net> |
6274 | L: netdev@vger.kernel.org | 6274 | L: netdev@vger.kernel.org |
6275 | S: Supported | 6275 | S: Maintained |
6276 | F: drivers/net/ethernet/smsc/smsc9420.* | 6276 | F: drivers/net/ethernet/smsc/smsc9420.* |
6277 | 6277 | ||
6278 | SMSC UFX6000 and UFX7000 USB to VGA DRIVER | 6278 | SMSC UFX6000 and UFX7000 USB to VGA DRIVER |
6279 | M: Steve Glendinning <steve.glendinning@smsc.com> | 6279 | M: Steve Glendinning <steve.glendinning@shawell.net> |
6280 | L: linux-fbdev@vger.kernel.org | 6280 | L: linux-fbdev@vger.kernel.org |
6281 | S: Supported | 6281 | S: Maintained |
6282 | F: drivers/video/smscufx.c | 6282 | F: drivers/video/smscufx.c |
6283 | 6283 | ||
6284 | SN-IA64 (Itanium) SUB-PLATFORM | 6284 | SN-IA64 (Itanium) SUB-PLATFORM |
@@ -7232,9 +7232,9 @@ S: Supported | |||
7232 | F: drivers/usb/serial/whiteheat* | 7232 | F: drivers/usb/serial/whiteheat* |
7233 | 7233 | ||
7234 | USB SMSC95XX ETHERNET DRIVER | 7234 | USB SMSC95XX ETHERNET DRIVER |
7235 | M: Steve Glendinning <steve.glendinning@smsc.com> | 7235 | M: Steve Glendinning <steve.glendinning@shawell.net> |
7236 | L: netdev@vger.kernel.org | 7236 | L: netdev@vger.kernel.org |
7237 | S: Supported | 7237 | S: Maintained |
7238 | F: drivers/net/usb/smsc95xx.* | 7238 | F: drivers/net/usb/smsc95xx.* |
7239 | 7239 | ||
7240 | USB SN9C1xx DRIVER | 7240 | USB SN9C1xx DRIVER |
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 2ce1ef07c13..ab99c3c3b75 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 519bcd3079e..e5fa46bfde2 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 b627cdc12b8..70f6d1d2546 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 e35a86bf4e1..637a1bdf2ac 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 e107e3915a8..d033a65f4e4 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 3882f3c7608..de47f170ba5 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 df8155b9d4d..08740eed050 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 7f4a0ed2415..5b7791dd396 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 f0b9cac8241..176a12cd56d 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 34849c4c6e3..eb46fd6038c 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 81bec28bdc4..b3f95a7f18b 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 37d03c097ae..0978ae2e484 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 03c9ff808b5..b0a47433341 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 202494d2ec6..216a4d754b0 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: |
diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c index 50d2f15a3c8..bcc053bc02c 100644 --- a/drivers/cpufreq/s3c2416-cpufreq.c +++ b/drivers/cpufreq/s3c2416-cpufreq.c | |||
@@ -153,7 +153,7 @@ static int s3c2416_cpufreq_enter_dvs(struct s3c2416_data *s3c_freq, int idx) | |||
153 | if (s3c_freq->vddarm) { | 153 | if (s3c_freq->vddarm) { |
154 | dvfs = &s3c2416_dvfs_table[idx]; | 154 | dvfs = &s3c2416_dvfs_table[idx]; |
155 | 155 | ||
156 | pr_debug("cpufreq: setting regultor to %d-%d\n", | 156 | pr_debug("cpufreq: setting regulator to %d-%d\n", |
157 | dvfs->vddarm_min, dvfs->vddarm_max); | 157 | dvfs->vddarm_min, dvfs->vddarm_max); |
158 | ret = regulator_set_voltage(s3c_freq->vddarm, | 158 | ret = regulator_set_voltage(s3c_freq->vddarm, |
159 | dvfs->vddarm_min, | 159 | dvfs->vddarm_min, |
@@ -186,7 +186,7 @@ static int s3c2416_cpufreq_leave_dvs(struct s3c2416_data *s3c_freq, int idx) | |||
186 | if (s3c_freq->vddarm) { | 186 | if (s3c_freq->vddarm) { |
187 | dvfs = &s3c2416_dvfs_table[idx]; | 187 | dvfs = &s3c2416_dvfs_table[idx]; |
188 | 188 | ||
189 | pr_debug("cpufreq: setting regultor to %d-%d\n", | 189 | pr_debug("cpufreq: setting regulator to %d-%d\n", |
190 | dvfs->vddarm_min, dvfs->vddarm_max); | 190 | dvfs->vddarm_min, dvfs->vddarm_max); |
191 | ret = regulator_set_voltage(s3c_freq->vddarm, | 191 | ret = regulator_set_voltage(s3c_freq->vddarm, |
192 | dvfs->vddarm_min, | 192 | dvfs->vddarm_min, |
diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c index 7432b3a72cd..e29b59aa68a 100644 --- a/drivers/cpufreq/speedstep-ich.c +++ b/drivers/cpufreq/speedstep-ich.c | |||
@@ -203,7 +203,7 @@ static unsigned int speedstep_detect_chipset(void) | |||
203 | if (speedstep_chipset_dev) { | 203 | if (speedstep_chipset_dev) { |
204 | /* speedstep.c causes lockups on Dell Inspirons 8000 and | 204 | /* speedstep.c causes lockups on Dell Inspirons 8000 and |
205 | * 8100 which use a pretty old revision of the 82815 | 205 | * 8100 which use a pretty old revision of the 82815 |
206 | * host brige. Abort on these systems. | 206 | * host bridge. Abort on these systems. |
207 | */ | 207 | */ |
208 | static struct pci_dev *hostbridge; | 208 | static struct pci_dev *hostbridge; |
209 | 209 | ||
diff --git a/drivers/hwmon/emc2103.c b/drivers/hwmon/emc2103.c index e7d234b5931..7bb8e888692 100644 --- a/drivers/hwmon/emc2103.c +++ b/drivers/hwmon/emc2103.c | |||
@@ -732,6 +732,6 @@ static struct i2c_driver emc2103_driver = { | |||
732 | 732 | ||
733 | module_i2c_driver(emc2103_driver); | 733 | module_i2c_driver(emc2103_driver); |
734 | 734 | ||
735 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); | 735 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); |
736 | MODULE_DESCRIPTION("SMSC EMC2103 hwmon driver"); | 736 | MODULE_DESCRIPTION("SMSC EMC2103 hwmon driver"); |
737 | MODULE_LICENSE("GPL"); | 737 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/input/keyboard/lm8333.c b/drivers/input/keyboard/lm8333.c index ca168a6679d..081fd9effa8 100644 --- a/drivers/input/keyboard/lm8333.c +++ b/drivers/input/keyboard/lm8333.c | |||
@@ -91,7 +91,7 @@ static void lm8333_key_handler(struct lm8333 *lm8333) | |||
91 | return; | 91 | return; |
92 | } | 92 | } |
93 | 93 | ||
94 | for (i = 0; keys[i] && i < LM8333_FIFO_TRANSFER_SIZE; i++) { | 94 | for (i = 0; i < LM8333_FIFO_TRANSFER_SIZE && keys[i]; i++) { |
95 | pressed = keys[i] & 0x80; | 95 | pressed = keys[i] & 0x80; |
96 | code = keys[i] & 0x7f; | 96 | code = keys[i] & 0x7f; |
97 | 97 | ||
diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c index a3735a01e9f..df9b756594f 100644 --- a/drivers/input/misc/cma3000_d0x.c +++ b/drivers/input/misc/cma3000_d0x.c | |||
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | /* | 59 | /* |
60 | * Bit weights in mg for bit 0, other bits need | 60 | * Bit weights in mg for bit 0, other bits need |
61 | * multipy factor 2^n. Eight bit is the sign bit. | 61 | * multiply factor 2^n. Eight bit is the sign bit. |
62 | */ | 62 | */ |
63 | #define BIT_TO_2G 18 | 63 | #define BIT_TO_2G 18 |
64 | #define BIT_TO_8G 71 | 64 | #define BIT_TO_8G 71 |
diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c index 036fe9bf157..be03238ad81 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd_iommu_v2.c | |||
@@ -924,7 +924,7 @@ static int __init amd_iommu_v2_init(void) | |||
924 | pr_info("AMD IOMMUv2 driver by Joerg Roedel <joerg.roedel@amd.com>\n"); | 924 | pr_info("AMD IOMMUv2 driver by Joerg Roedel <joerg.roedel@amd.com>\n"); |
925 | 925 | ||
926 | if (!amd_iommu_v2_supported()) { | 926 | if (!amd_iommu_v2_supported()) { |
927 | pr_info("AMD IOMMUv2 functionality not available on this sytem\n"); | 927 | pr_info("AMD IOMMUv2 functionality not available on this system\n"); |
928 | /* | 928 | /* |
929 | * Load anyway to provide the symbols to other modules | 929 | * Load anyway to provide the symbols to other modules |
930 | * which may use AMD IOMMUv2 optionally. | 930 | * which may use AMD IOMMUv2 optionally. |
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 9a114b9ff17..4407d5eff05 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c | |||
@@ -317,7 +317,7 @@ static int default_fault_handler(enum exynos_sysmmu_inttype itype, | |||
317 | if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT)) | 317 | if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT)) |
318 | itype = SYSMMU_FAULT_UNKNOWN; | 318 | itype = SYSMMU_FAULT_UNKNOWN; |
319 | 319 | ||
320 | pr_err("%s occured at 0x%lx(Page table base: 0x%lx)\n", | 320 | pr_err("%s occurred at 0x%lx(Page table base: 0x%lx)\n", |
321 | sysmmu_fault_name[itype], fault_addr, pgtable_base); | 321 | sysmmu_fault_name[itype], fault_addr, pgtable_base); |
322 | 322 | ||
323 | ent = section_entry(__va(pgtable_base), fault_addr); | 323 | ent = section_entry(__va(pgtable_base), fault_addr); |
diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index c5c274ab5c5..67da6cff74e 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c | |||
@@ -198,10 +198,10 @@ iova_insert_rbtree(struct rb_root *root, struct iova *iova) | |||
198 | 198 | ||
199 | /** | 199 | /** |
200 | * alloc_iova - allocates an iova | 200 | * alloc_iova - allocates an iova |
201 | * @iovad - iova domain in question | 201 | * @iovad: - iova domain in question |
202 | * @size - size of page frames to allocate | 202 | * @size: - size of page frames to allocate |
203 | * @limit_pfn - max limit address | 203 | * @limit_pfn: - max limit address |
204 | * @size_aligned - set if size_aligned address range is required | 204 | * @size_aligned: - set if size_aligned address range is required |
205 | * This function allocates an iova in the range limit_pfn to IOVA_START_PFN | 205 | * This function allocates an iova in the range limit_pfn to IOVA_START_PFN |
206 | * looking from limit_pfn instead from IOVA_START_PFN. If the size_aligned | 206 | * looking from limit_pfn instead from IOVA_START_PFN. If the size_aligned |
207 | * flag is set then the allocated address iova->pfn_lo will be naturally | 207 | * flag is set then the allocated address iova->pfn_lo will be naturally |
@@ -238,8 +238,8 @@ alloc_iova(struct iova_domain *iovad, unsigned long size, | |||
238 | 238 | ||
239 | /** | 239 | /** |
240 | * find_iova - find's an iova for a given pfn | 240 | * find_iova - find's an iova for a given pfn |
241 | * @iovad - iova domain in question. | 241 | * @iovad: - iova domain in question. |
242 | * pfn - page frame number | 242 | * @pfn: - page frame number |
243 | * This function finds and returns an iova belonging to the | 243 | * This function finds and returns an iova belonging to the |
244 | * given doamin which matches the given pfn. | 244 | * given doamin which matches the given pfn. |
245 | */ | 245 | */ |
@@ -260,7 +260,7 @@ struct iova *find_iova(struct iova_domain *iovad, unsigned long pfn) | |||
260 | /* We are not holding the lock while this iova | 260 | /* We are not holding the lock while this iova |
261 | * is referenced by the caller as the same thread | 261 | * is referenced by the caller as the same thread |
262 | * which called this function also calls __free_iova() | 262 | * which called this function also calls __free_iova() |
263 | * and it is by desing that only one thread can possibly | 263 | * and it is by design that only one thread can possibly |
264 | * reference a particular iova and hence no conflict. | 264 | * reference a particular iova and hence no conflict. |
265 | */ | 265 | */ |
266 | return iova; | 266 | return iova; |
diff --git a/drivers/media/video/zoran/zr36016.c b/drivers/media/video/zoran/zr36016.c index 21c088ea904..b87ddba8608 100644 --- a/drivers/media/video/zoran/zr36016.c +++ b/drivers/media/video/zoran/zr36016.c | |||
@@ -40,10 +40,10 @@ | |||
40 | /* v4l API */ | 40 | /* v4l API */ |
41 | 41 | ||
42 | /* headerfile of this module */ | 42 | /* headerfile of this module */ |
43 | #include"zr36016.h" | 43 | #include "zr36016.h" |
44 | 44 | ||
45 | /* codec io API */ | 45 | /* codec io API */ |
46 | #include"videocodec.h" | 46 | #include "videocodec.h" |
47 | 47 | ||
48 | /* it doesn't make sense to have more than 20 or so, | 48 | /* it doesn't make sense to have more than 20 or so, |
49 | just to prevent some unwanted loops */ | 49 | just to prevent some unwanted loops */ |
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index c6b06d311fe..6d6192316b3 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * Free Software Foundation; either version 2 of the License, or (at your | 12 | * Free Software Foundation; either version 2 of the License, or (at your |
13 | * option) any later version. | 13 | * option) any later version. |
14 | * | 14 | * |
15 | * Support added for SMSC LAN8187 and LAN8700 by steve.glendinning@smsc.com | 15 | * Support added for SMSC LAN8187 and LAN8700 by steve.glendinning@shawell.net |
16 | * | 16 | * |
17 | */ | 17 | */ |
18 | 18 | ||
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index 6c0c5b76fc4..f5ab6e613ec 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c | |||
@@ -1260,6 +1260,6 @@ static struct usb_driver smsc75xx_driver = { | |||
1260 | module_usb_driver(smsc75xx_driver); | 1260 | module_usb_driver(smsc75xx_driver); |
1261 | 1261 | ||
1262 | MODULE_AUTHOR("Nancy Lin"); | 1262 | MODULE_AUTHOR("Nancy Lin"); |
1263 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); | 1263 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); |
1264 | MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices"); | 1264 | MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices"); |
1265 | MODULE_LICENSE("GPL"); | 1265 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 25cc3a15a4e..d45e539a84b 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c | |||
@@ -1335,6 +1335,6 @@ static struct usb_driver smsc95xx_driver = { | |||
1335 | module_usb_driver(smsc95xx_driver); | 1335 | module_usb_driver(smsc95xx_driver); |
1336 | 1336 | ||
1337 | MODULE_AUTHOR("Nancy Lin"); | 1337 | MODULE_AUTHOR("Nancy Lin"); |
1338 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); | 1338 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); |
1339 | MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices"); | 1339 | MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices"); |
1340 | MODULE_LICENSE("GPL"); | 1340 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c index 66c873399ab..3dfebfb8434 100644 --- a/drivers/net/wireless/iwlwifi/iwl-io.c +++ b/drivers/net/wireless/iwlwifi/iwl-io.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/export.h> | 30 | #include <linux/export.h> |
31 | 31 | ||
32 | #include "iwl-io.h" | 32 | #include "iwl-io.h" |
33 | #include"iwl-csr.h" | 33 | #include "iwl-csr.h" |
34 | #include "iwl-debug.h" | 34 | #include "iwl-debug.h" |
35 | 35 | ||
36 | #define IWL_POLL_INTERVAL 10 /* microseconds */ | 36 | #define IWL_POLL_INTERVAL 10 /* microseconds */ |
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c index 1f9e9fefb8e..69ff60832b0 100644 --- a/drivers/parisc/iosapic.c +++ b/drivers/parisc/iosapic.c | |||
@@ -146,7 +146,7 @@ | |||
146 | #endif | 146 | #endif |
147 | 147 | ||
148 | #include <asm/ropes.h> | 148 | #include <asm/ropes.h> |
149 | #include "./iosapic_private.h" | 149 | #include "iosapic_private.h" |
150 | 150 | ||
151 | #define MODULE_NAME "iosapic" | 151 | #define MODULE_NAME "iosapic" |
152 | 152 | ||
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c index 4fda7e6a86a..01cc054eb0d 100644 --- a/drivers/pci/hotplug/ibmphp_core.c +++ b/drivers/pci/hotplug/ibmphp_core.c | |||
@@ -760,7 +760,7 @@ static u8 bus_structure_fixup(u8 busno) | |||
760 | for (dev->devfn = 0; dev->devfn < 256; dev->devfn += 8) { | 760 | for (dev->devfn = 0; dev->devfn < 256; dev->devfn += 8) { |
761 | if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) && | 761 | if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) && |
762 | (l != 0x0000) && (l != 0xffff)) { | 762 | (l != 0x0000) && (l != 0xffff)) { |
763 | debug("%s - Inside bus_struture_fixup()\n", | 763 | debug("%s - Inside bus_structure_fixup()\n", |
764 | __func__); | 764 | __func__); |
765 | pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL); | 765 | pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL); |
766 | break; | 766 | break; |
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c index 714ca5c4ed5..9df78bc1454 100644 --- a/drivers/pci/hotplug/ibmphp_ebda.c +++ b/drivers/pci/hotplug/ibmphp_ebda.c | |||
@@ -784,7 +784,7 @@ static int __init ebda_rsrc_controller (void) | |||
784 | hpc_ptr->ctlr_relative_id = ctlr; | 784 | hpc_ptr->ctlr_relative_id = ctlr; |
785 | hpc_ptr->slot_count = slot_num; | 785 | hpc_ptr->slot_count = slot_num; |
786 | hpc_ptr->bus_count = bus_num; | 786 | hpc_ptr->bus_count = bus_num; |
787 | debug ("now enter ctlr data struture ---\n"); | 787 | debug ("now enter ctlr data structure ---\n"); |
788 | debug ("ctlr id: %x\n", ctlr_id); | 788 | debug ("ctlr id: %x\n", ctlr_id); |
789 | debug ("ctlr_relative_id: %x\n", hpc_ptr->ctlr_relative_id); | 789 | debug ("ctlr_relative_id: %x\n", hpc_ptr->ctlr_relative_id); |
790 | debug ("count of slots controlled by this ctlr: %x\n", slot_num); | 790 | debug ("count of slots controlled by this ctlr: %x\n", slot_num); |
diff --git a/drivers/pci/hotplug/ibmphp_pci.c b/drivers/pci/hotplug/ibmphp_pci.c index 7b09e16173a..c60f5f3e838 100644 --- a/drivers/pci/hotplug/ibmphp_pci.c +++ b/drivers/pci/hotplug/ibmphp_pci.c | |||
@@ -109,7 +109,7 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno) | |||
109 | 109 | ||
110 | cur_func->function = function; | 110 | cur_func->function = function; |
111 | 111 | ||
112 | debug ("inside the loop, cur_func->busno = %x, cur_func->device = %x, cur_func->funcion = %x\n", | 112 | debug ("inside the loop, cur_func->busno = %x, cur_func->device = %x, cur_func->function = %x\n", |
113 | cur_func->busno, cur_func->device, cur_func->function); | 113 | cur_func->busno, cur_func->device, cur_func->function); |
114 | 114 | ||
115 | pci_bus_read_config_word (ibmphp_pci_bus, devfn, PCI_VENDOR_ID, &vendor_id); | 115 | pci_bus_read_config_word (ibmphp_pci_bus, devfn, PCI_VENDOR_ID, &vendor_id); |
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 8fa2d4be88d..a7ba6de588a 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -308,7 +308,7 @@ static void __assign_resources_sorted(struct list_head *head, | |||
308 | * Should not assign requested resources at first. | 308 | * Should not assign requested resources at first. |
309 | * they could be adjacent, so later reassign can not reallocate | 309 | * they could be adjacent, so later reassign can not reallocate |
310 | * them one by one in parent resource window. | 310 | * them one by one in parent resource window. |
311 | * Try to assign requested + add_size at begining | 311 | * Try to assign requested + add_size at beginning |
312 | * if could do that, could get out early. | 312 | * if could do that, could get out early. |
313 | * if could not do that, we still try to assign requested at first, | 313 | * if could not do that, we still try to assign requested at first, |
314 | * then try to reassign add_size for some resources. | 314 | * then try to reassign add_size for some resources. |
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 70b4a979a6f..aa764ecc4e6 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
@@ -301,7 +301,7 @@ config AB8500_BM | |||
301 | bool "AB8500 Battery Management Driver" | 301 | bool "AB8500 Battery Management Driver" |
302 | depends on AB8500_CORE && AB8500_GPADC | 302 | depends on AB8500_CORE && AB8500_GPADC |
303 | help | 303 | help |
304 | Say Y to include support for AB5500 battery management. | 304 | Say Y to include support for AB8500 battery management. |
305 | 305 | ||
306 | config AB8500_BATTERY_THERM_ON_BATCTRL | 306 | config AB8500_BATTERY_THERM_ON_BATCTRL |
307 | bool "Thermistor connected on BATCTRL ADC" | 307 | bool "Thermistor connected on BATCTRL ADC" |
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index 19a36945e6f..dd4547bf688 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c | |||
@@ -2984,8 +2984,8 @@ static int get_command(char *pos, Scsi_Cmnd * ptr) | |||
2984 | char *start = pos; | 2984 | char *start = pos; |
2985 | int i; | 2985 | int i; |
2986 | 2986 | ||
2987 | SPRINTF("0x%08x: target=%d; lun=%d; cmnd=( ", | 2987 | SPRINTF("%p: target=%d; lun=%d; cmnd=( ", |
2988 | (unsigned int) ptr, ptr->device->id, ptr->device->lun); | 2988 | ptr, ptr->device->id, ptr->device->lun); |
2989 | 2989 | ||
2990 | for (i = 0; i < COMMAND_SIZE(ptr->cmnd[0]); i++) | 2990 | for (i = 0; i < COMMAND_SIZE(ptr->cmnd[0]); i++) |
2991 | SPRINTF("0x%02x ", ptr->cmnd[i]); | 2991 | SPRINTF("0x%02x ", ptr->cmnd[i]); |
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index f79c8f9e33a..770c48ddbe5 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c | |||
@@ -49,7 +49,7 @@ | |||
49 | #define SCSI_BUF_PA(address) isa_virt_to_bus(address) | 49 | #define SCSI_BUF_PA(address) isa_virt_to_bus(address) |
50 | #define SCSI_SG_PA(sgent) (isa_page_to_bus(sg_page((sgent))) + (sgent)->offset) | 50 | #define SCSI_SG_PA(sgent) (isa_page_to_bus(sg_page((sgent))) + (sgent)->offset) |
51 | 51 | ||
52 | #include<linux/stat.h> | 52 | #include <linux/stat.h> |
53 | 53 | ||
54 | #ifdef DEBUG | 54 | #ifdef DEBUG |
55 | #define DEB(x) x | 55 | #define DEB(x) x |
diff --git a/drivers/staging/comedi/drivers/s626.h b/drivers/staging/comedi/drivers/s626.h index 2d1afecbbb6..92d3ea5eb44 100644 --- a/drivers/staging/comedi/drivers/s626.h +++ b/drivers/staging/comedi/drivers/s626.h | |||
@@ -80,7 +80,7 @@ | |||
80 | #define INLINE static __inline | 80 | #define INLINE static __inline |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | #include<linux/slab.h> | 83 | #include <linux/slab.h> |
84 | 84 | ||
85 | #define S626_SIZE 0x0200 | 85 | #define S626_SIZE 0x0200 |
86 | #define SIZEOF_ADDRESS_SPACE 0x0200 | 86 | #define SIZEOF_ADDRESS_SPACE 0x0200 |
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c index a165490bae4..8c9bb1ad306 100644 --- a/drivers/usb/renesas_usbhs/common.c +++ b/drivers/usb/renesas_usbhs/common.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/pm_runtime.h> | 19 | #include <linux/pm_runtime.h> |
20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
21 | #include <linux/sysfs.h> | 21 | #include <linux/sysfs.h> |
22 | #include "./common.h" | 22 | #include "common.h" |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * image of renesas_usbhs | 25 | * image of renesas_usbhs |
diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h index 3f3ccd35875..dddf40a59de 100644 --- a/drivers/usb/renesas_usbhs/common.h +++ b/drivers/usb/renesas_usbhs/common.h | |||
@@ -22,8 +22,8 @@ | |||
22 | 22 | ||
23 | struct usbhs_priv; | 23 | struct usbhs_priv; |
24 | 24 | ||
25 | #include "./mod.h" | 25 | #include "mod.h" |
26 | #include "./pipe.h" | 26 | #include "pipe.h" |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * | 29 | * |
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c index 6ec7f838d7f..08313574aac 100644 --- a/drivers/usb/renesas_usbhs/fifo.c +++ b/drivers/usb/renesas_usbhs/fifo.c | |||
@@ -17,8 +17,8 @@ | |||
17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
19 | #include <linux/scatterlist.h> | 19 | #include <linux/scatterlist.h> |
20 | #include "./common.h" | 20 | #include "common.h" |
21 | #include "./pipe.h" | 21 | #include "pipe.h" |
22 | 22 | ||
23 | #define usbhsf_get_cfifo(p) (&((p)->fifo_info.cfifo)) | 23 | #define usbhsf_get_cfifo(p) (&((p)->fifo_info.cfifo)) |
24 | #define usbhsf_get_d0fifo(p) (&((p)->fifo_info.d0fifo)) | 24 | #define usbhsf_get_d0fifo(p) (&((p)->fifo_info.d0fifo)) |
diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c index 0871e816df4..82a628f96c0 100644 --- a/drivers/usb/renesas_usbhs/mod.c +++ b/drivers/usb/renesas_usbhs/mod.c | |||
@@ -16,8 +16,8 @@ | |||
16 | */ | 16 | */ |
17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
18 | 18 | ||
19 | #include "./common.h" | 19 | #include "common.h" |
20 | #include "./mod.h" | 20 | #include "mod.h" |
21 | 21 | ||
22 | #define usbhs_priv_to_modinfo(priv) (&priv->mod_info) | 22 | #define usbhs_priv_to_modinfo(priv) (&priv->mod_info) |
23 | #define usbhs_mod_info_call(priv, func, param...) \ | 23 | #define usbhs_mod_info_call(priv, func, param...) \ |
diff --git a/drivers/usb/renesas_usbhs/mod.h b/drivers/usb/renesas_usbhs/mod.h index 6c6875533f0..1ef5bf60407 100644 --- a/drivers/usb/renesas_usbhs/mod.h +++ b/drivers/usb/renesas_usbhs/mod.h | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
21 | #include <linux/usb/renesas_usbhs.h> | 21 | #include <linux/usb/renesas_usbhs.h> |
22 | #include "./common.h" | 22 | #include "common.h" |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * struct | 25 | * struct |
diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c index feb06d6d281..122526cfd32 100644 --- a/drivers/usb/renesas_usbhs/pipe.c +++ b/drivers/usb/renesas_usbhs/pipe.c | |||
@@ -16,8 +16,8 @@ | |||
16 | */ | 16 | */ |
17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include "./common.h" | 19 | #include "common.h" |
20 | #include "./pipe.h" | 20 | #include "pipe.h" |
21 | 21 | ||
22 | /* | 22 | /* |
23 | * macros | 23 | * macros |
diff --git a/drivers/usb/renesas_usbhs/pipe.h b/drivers/usb/renesas_usbhs/pipe.h index fa18b7dc2b2..08786c06dcf 100644 --- a/drivers/usb/renesas_usbhs/pipe.h +++ b/drivers/usb/renesas_usbhs/pipe.h | |||
@@ -17,8 +17,8 @@ | |||
17 | #ifndef RENESAS_USB_PIPE_H | 17 | #ifndef RENESAS_USB_PIPE_H |
18 | #define RENESAS_USB_PIPE_H | 18 | #define RENESAS_USB_PIPE_H |
19 | 19 | ||
20 | #include "./common.h" | 20 | #include "common.h" |
21 | #include "./fifo.h" | 21 | #include "fifo.h" |
22 | 22 | ||
23 | /* | 23 | /* |
24 | * struct | 24 | * struct |
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index c22e8d39a2c..a1d58e9d307 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
@@ -336,8 +336,8 @@ static void arcfb_lcd_update_horiz(struct arcfb_par *par, unsigned int left, | |||
336 | } | 336 | } |
337 | 337 | ||
338 | /* | 338 | /* |
339 | * here we start the process of spliting out the fb update into | 339 | * here we start the process of splitting out the fb update into |
340 | * individual blocks of pixels. we end up spliting into 64x64 blocks | 340 | * individual blocks of pixels. we end up splitting into 64x64 blocks |
341 | * and finally down to 64x8 pages. | 341 | * and finally down to 64x8 pages. |
342 | */ | 342 | */ |
343 | static void arcfb_lcd_update(struct arcfb_par *par, unsigned int dx, | 343 | static void arcfb_lcd_update(struct arcfb_par *par, unsigned int dx, |
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index d99505b1637..15055395cd9 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
@@ -939,7 +939,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) | |||
939 | * up a splash image. | 939 | * up a splash image. |
940 | */ | 940 | */ |
941 | } else { | 941 | } else { |
942 | /* alocate memory buffer */ | 942 | /* allocate memory buffer */ |
943 | ret = atmel_lcdfb_alloc_video_memory(sinfo); | 943 | ret = atmel_lcdfb_alloc_video_memory(sinfo); |
944 | if (ret < 0) { | 944 | if (ret < 0) { |
945 | dev_err(dev, "cannot allocate framebuffer: %d\n", ret); | 945 | dev_err(dev, "cannot allocate framebuffer: %d\n", ret); |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 622f12b62a4..3f2e8c13f1c 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -863,7 +863,7 @@ static int aty_var_to_crtc(const struct fb_info *info, | |||
863 | 863 | ||
864 | if ((xres > 1600) || (yres > 1200)) { | 864 | if ((xres > 1600) || (yres > 1200)) { |
865 | FAIL("MACH64 chips are designed for max 1600x1200\n" | 865 | FAIL("MACH64 chips are designed for max 1600x1200\n" |
866 | "select anoter resolution."); | 866 | "select another resolution."); |
867 | } | 867 | } |
868 | h_sync_strt = h_disp + var->right_margin; | 868 | h_sync_strt = h_disp + var->right_margin; |
869 | h_sync_end = h_sync_strt + var->hsync_len; | 869 | h_sync_end = h_sync_strt + var->hsync_len; |
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index ce1506b75ad..9e279ee38da 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -2018,7 +2018,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) | |||
2018 | if ((rinfo->family == CHIP_FAMILY_RS100) || | 2018 | if ((rinfo->family == CHIP_FAMILY_RS100) || |
2019 | (rinfo->family == CHIP_FAMILY_RS200)) { | 2019 | (rinfo->family == CHIP_FAMILY_RS200)) { |
2020 | /* This is to workaround the asic bug for RMX, some versions | 2020 | /* This is to workaround the asic bug for RMX, some versions |
2021 | of BIOS dosen't have this register initialized correctly. | 2021 | of BIOS doesn't have this register initialized correctly. |
2022 | */ | 2022 | */ |
2023 | OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN, | 2023 | OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN, |
2024 | ~CRTC_H_CUTOFF_ACTIVE_EN); | 2024 | ~CRTC_H_CUTOFF_ACTIVE_EN); |
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c index f49181c7311..f75da8758ad 100644 --- a/drivers/video/backlight/88pm860x_bl.c +++ b/drivers/video/backlight/88pm860x_bl.c | |||
@@ -228,6 +228,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev) | |||
228 | data->port = pdata->flags; | 228 | data->port = pdata->flags; |
229 | if (data->port < 0) { | 229 | if (data->port < 0) { |
230 | dev_err(&pdev->dev, "wrong platform data is assigned"); | 230 | dev_err(&pdev->dev, "wrong platform data is assigned"); |
231 | kfree(data); | ||
231 | return -EINVAL; | 232 | return -EINVAL; |
232 | } | 233 | } |
233 | 234 | ||
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c index 9bdd4b0c18c..d0f121bd8b2 100644 --- a/drivers/video/bfin_adv7393fb.c +++ b/drivers/video/bfin_adv7393fb.c | |||
@@ -58,7 +58,7 @@ static const unsigned short ppi_pins[] = { | |||
58 | */ | 58 | */ |
59 | 59 | ||
60 | static struct bfin_adv7393_fb_par { | 60 | static struct bfin_adv7393_fb_par { |
61 | /* structure holding blackfin / adv7393 paramters when | 61 | /* structure holding blackfin / adv7393 parameters when |
62 | screen is blanked */ | 62 | screen is blanked */ |
63 | struct { | 63 | struct { |
64 | u8 Mode; /* ntsc/pal/? */ | 64 | u8 Mode; /* ntsc/pal/? */ |
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index 738c8ce7d13..bc67d05cad6 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
@@ -1611,7 +1611,7 @@ static void init_vgachip(struct fb_info *info) | |||
1611 | /* ext. display controls: ext.adr. wrap */ | 1611 | /* ext. display controls: ext.adr. wrap */ |
1612 | vga_wcrt(cinfo->regbase, CL_CRT1B, 0x02); | 1612 | vga_wcrt(cinfo->regbase, CL_CRT1B, 0x02); |
1613 | 1613 | ||
1614 | /* Set/Reset registes: - */ | 1614 | /* Set/Reset registers: - */ |
1615 | vga_wgfx(cinfo->regbase, VGA_GFX_SR_VALUE, 0x00); | 1615 | vga_wgfx(cinfo->regbase, VGA_GFX_SR_VALUE, 0x00); |
1616 | /* Set/Reset enable: - */ | 1616 | /* Set/Reset enable: - */ |
1617 | vga_wgfx(cinfo->regbase, VGA_GFX_SR_ENABLE, 0x00); | 1617 | vga_wgfx(cinfo->regbase, VGA_GFX_SR_ENABLE, 0x00); |
diff --git a/drivers/video/exynos/exynos_dp_reg.c b/drivers/video/exynos/exynos_dp_reg.c index 6ce76d56c3a..bcb0e3ae1e9 100644 --- a/drivers/video/exynos/exynos_dp_reg.c +++ b/drivers/video/exynos/exynos_dp_reg.c | |||
@@ -752,7 +752,7 @@ int exynos_dp_read_bytes_from_i2c(struct exynos_dp_device *dp, | |||
752 | 752 | ||
753 | /* | 753 | /* |
754 | * If Rx sends defer, Tx sends only reads | 754 | * If Rx sends defer, Tx sends only reads |
755 | * request without sending addres | 755 | * request without sending address |
756 | */ | 756 | */ |
757 | if (!defer) | 757 | if (!defer) |
758 | retval = exynos_dp_select_i2c_device(dp, | 758 | retval = exynos_dp_select_i2c_device(dp, |
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c index 6c1f5c314a4..9908e75ae76 100644 --- a/drivers/video/exynos/exynos_mipi_dsi.c +++ b/drivers/video/exynos/exynos_mipi_dsi.c | |||
@@ -106,7 +106,7 @@ static void exynos_mipi_update_cfg(struct mipi_dsim_device *dsim) | |||
106 | 106 | ||
107 | /* | 107 | /* |
108 | * data from Display controller(FIMD) is transferred in video mode | 108 | * data from Display controller(FIMD) is transferred in video mode |
109 | * but in case of command mode, all settigs is updated to registers. | 109 | * but in case of command mode, all settings are updated to registers. |
110 | */ | 110 | */ |
111 | exynos_mipi_dsi_stand_by(dsim, 1); | 111 | exynos_mipi_dsi_stand_by(dsim, 1); |
112 | } | 112 | } |
diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c index fe574d84ed9..ff3f8808e4e 100644 --- a/drivers/video/i740fb.c +++ b/drivers/video/i740fb.c | |||
@@ -497,7 +497,7 @@ static int i740fb_decode_var(const struct fb_var_screeninfo *var, | |||
497 | 497 | ||
498 | mem = vxres * vyres * ((bpp + 1) / 8); | 498 | mem = vxres * vyres * ((bpp + 1) / 8); |
499 | if (mem > info->screen_size) { | 499 | if (mem > info->screen_size) { |
500 | dev_err(info->device, "not enough video memory (%d KB requested, %ld KB avaliable)\n", | 500 | dev_err(info->device, "not enough video memory (%d KB requested, %ld KB available)\n", |
501 | mem >> 10, info->screen_size >> 10); | 501 | mem >> 10, info->screen_size >> 10); |
502 | return -ENOMEM; | 502 | return -ENOMEM; |
503 | } | 503 | } |
@@ -728,7 +728,7 @@ static void vga_protect(struct i740fb_par *par) | |||
728 | i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0x20, 0x20); | 728 | i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0x20, 0x20); |
729 | 729 | ||
730 | i740inb(par, 0x3DA); | 730 | i740inb(par, 0x3DA); |
731 | i740outb(par, VGA_ATT_W, 0x00); /* enable pallete access */ | 731 | i740outb(par, VGA_ATT_W, 0x00); /* enable palette access */ |
732 | } | 732 | } |
733 | 733 | ||
734 | static void vga_unprotect(struct i740fb_par *par) | 734 | static void vga_unprotect(struct i740fb_par *par) |
@@ -737,7 +737,7 @@ static void vga_unprotect(struct i740fb_par *par) | |||
737 | i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0, 0x20); | 737 | i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0, 0x20); |
738 | 738 | ||
739 | i740inb(par, 0x3DA); | 739 | i740inb(par, 0x3DA); |
740 | i740outb(par, VGA_ATT_W, 0x20); /* disable pallete access */ | 740 | i740outb(par, VGA_ATT_W, 0x20); /* disable palette access */ |
741 | } | 741 | } |
742 | 742 | ||
743 | static int i740fb_set_par(struct fb_info *info) | 743 | static int i740fb_set_par(struct fb_info *info) |
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index ea7b661e722..69bf9d07c23 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c | |||
@@ -189,7 +189,7 @@ struct s3c_fb_vsync { | |||
189 | 189 | ||
190 | /** | 190 | /** |
191 | * struct s3c_fb - overall hardware state of the hardware | 191 | * struct s3c_fb - overall hardware state of the hardware |
192 | * @slock: The spinlock protection for this data sturcture. | 192 | * @slock: The spinlock protection for this data sturucture. |
193 | * @dev: The device that we bound to, for printing, etc. | 193 | * @dev: The device that we bound to, for printing, etc. |
194 | * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. | 194 | * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. |
195 | * @lcd_clk: The clk (sclk) feeding pixclk. | 195 | * @lcd_clk: The clk (sclk) feeding pixclk. |
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index f3d3b9ce475..0d0f52c18fd 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c | |||
@@ -662,7 +662,7 @@ static void savage_get_default_par(struct savagefb_par *par, struct savage_reg * | |||
662 | vga_out8(0x3c4, 0x18, par); | 662 | vga_out8(0x3c4, 0x18, par); |
663 | reg->SR18 = vga_in8(0x3c5, par); | 663 | reg->SR18 = vga_in8(0x3c5, par); |
664 | 664 | ||
665 | /* Save flat panel expansion regsters. */ | 665 | /* Save flat panel expansion registers. */ |
666 | if (par->chip == S3_SAVAGE_MX) { | 666 | if (par->chip == S3_SAVAGE_MX) { |
667 | int i; | 667 | int i; |
668 | 668 | ||
@@ -815,7 +815,7 @@ static void savage_set_default_par(struct savagefb_par *par, | |||
815 | vga_out8(0x3c4, 0x18, par); | 815 | vga_out8(0x3c4, 0x18, par); |
816 | vga_out8(0x3c5, reg->SR18, par); | 816 | vga_out8(0x3c5, reg->SR18, par); |
817 | 817 | ||
818 | /* Save flat panel expansion regsters. */ | 818 | /* Save flat panel expansion registers. */ |
819 | if (par->chip == S3_SAVAGE_MX) { | 819 | if (par->chip == S3_SAVAGE_MX) { |
820 | int i; | 820 | int i; |
821 | 821 | ||
@@ -1318,7 +1318,7 @@ static void savagefb_set_par_int(struct savagefb_par *par, struct savage_reg *r | |||
1318 | vga_out8(0x3c4, 0x15, par); | 1318 | vga_out8(0x3c4, 0x15, par); |
1319 | vga_out8(0x3c5, reg->SR15, par); | 1319 | vga_out8(0x3c5, reg->SR15, par); |
1320 | 1320 | ||
1321 | /* Restore flat panel expansion regsters. */ | 1321 | /* Restore flat panel expansion registers. */ |
1322 | if (par->chip == S3_SAVAGE_MX) { | 1322 | if (par->chip == S3_SAVAGE_MX) { |
1323 | int i; | 1323 | int i; |
1324 | 1324 | ||
diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c index 66de832361c..f082ae55c0c 100644 --- a/drivers/video/sis/init.c +++ b/drivers/video/sis/init.c | |||
@@ -2628,7 +2628,8 @@ SiS_SetVCLKState(struct SiS_Private *SiS_Pr, unsigned short ModeNo, | |||
2628 | else if(VCLK >= 135) data = 0x02; | 2628 | else if(VCLK >= 135) data = 0x02; |
2629 | 2629 | ||
2630 | if(SiS_Pr->ChipType == SIS_540) { | 2630 | if(SiS_Pr->ChipType == SIS_540) { |
2631 | if((VCLK == 203) || (VCLK < 234)) data = 0x02; | 2631 | /* Was == 203 or < 234 which made no sense */ |
2632 | if (VCLK < 234) data = 0x02; | ||
2632 | } | 2633 | } |
2633 | 2634 | ||
2634 | if(SiS_Pr->ChipType < SIS_315H) { | 2635 | if(SiS_Pr->ChipType < SIS_315H) { |
diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c index af3ef27ad36..26f86428949 100644 --- a/drivers/video/smscufx.c +++ b/drivers/video/smscufx.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * smscufx.c -- Framebuffer driver for SMSC UFX USB controller | 2 | * smscufx.c -- Framebuffer driver for SMSC UFX USB controller |
3 | * | 3 | * |
4 | * Copyright (C) 2011 Steve Glendinning <steve.glendinning@smsc.com> | 4 | * Copyright (C) 2011 Steve Glendinning <steve.glendinning@shawell.net> |
5 | * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> | 5 | * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> |
6 | * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> | 6 | * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> |
7 | * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> | 7 | * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> |
@@ -1002,7 +1002,7 @@ static int ufx_ops_ioctl(struct fb_info *info, unsigned int cmd, | |||
1002 | /* TODO: Help propose a standard fb.h ioctl to report mmap damage */ | 1002 | /* TODO: Help propose a standard fb.h ioctl to report mmap damage */ |
1003 | if (cmd == UFX_IOCTL_REPORT_DAMAGE) { | 1003 | if (cmd == UFX_IOCTL_REPORT_DAMAGE) { |
1004 | /* If we have a damage-aware client, turn fb_defio "off" | 1004 | /* If we have a damage-aware client, turn fb_defio "off" |
1005 | * To avoid perf imact of unecessary page fault handling. | 1005 | * To avoid perf imact of unnecessary page fault handling. |
1006 | * Done by resetting the delay for this fb_info to a very | 1006 | * Done by resetting the delay for this fb_info to a very |
1007 | * long period. Pages will become writable and stay that way. | 1007 | * long period. Pages will become writable and stay that way. |
1008 | * Reset to normal value when all clients have closed this fb. | 1008 | * Reset to normal value when all clients have closed this fb. |
@@ -1466,7 +1466,7 @@ static int ufx_read_edid(struct ufx_data *dev, u8 *edid, int edid_len) | |||
1466 | /* all FF's in the first 16 bytes indicates nothing is connected */ | 1466 | /* all FF's in the first 16 bytes indicates nothing is connected */ |
1467 | for (i = 0; i < 16; i++) { | 1467 | for (i = 0; i < 16; i++) { |
1468 | if (edid[i] != 0xFF) { | 1468 | if (edid[i] != 0xFF) { |
1469 | pr_debug("edid data read succesfully"); | 1469 | pr_debug("edid data read successfully"); |
1470 | return EDID_LENGTH; | 1470 | return EDID_LENGTH; |
1471 | } | 1471 | } |
1472 | } | 1472 | } |
@@ -1972,6 +1972,6 @@ MODULE_PARM_DESC(console, "Allow fbcon to be used on this display"); | |||
1972 | module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); | 1972 | module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); |
1973 | MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); | 1973 | MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); |
1974 | 1974 | ||
1975 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); | 1975 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); |
1976 | MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); | 1976 | MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); |
1977 | MODULE_LICENSE("GPL"); | 1977 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c index b9c2b948d34..eb931b8626f 100644 --- a/drivers/video/sunxvr500.c +++ b/drivers/video/sunxvr500.c | |||
@@ -12,7 +12,7 @@ | |||
12 | 12 | ||
13 | #include <asm/io.h> | 13 | #include <asm/io.h> |
14 | 14 | ||
15 | /* XXX This device has a 'dev-comm' property which aparently is | 15 | /* XXX This device has a 'dev-comm' property which apparently is |
16 | * XXX a pointer into the openfirmware's address space which is | 16 | * XXX a pointer into the openfirmware's address space which is |
17 | * XXX a shared area the kernel driver can use to keep OBP | 17 | * XXX a shared area the kernel driver can use to keep OBP |
18 | * XXX informed about the current resolution setting. The idea | 18 | * XXX informed about the current resolution setting. The idea |
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 01c21b6c6d4..deafe19c34b 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -929,7 +929,8 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, int bits, | |||
929 | 929 | ||
930 | 930 | ||
931 | /** | 931 | /** |
932 | * convert_extent - convert all bits in a given range from one bit to another | 932 | * convert_extent_bit - convert all bits in a given range from one bit to |
933 | * another | ||
933 | * @tree: the io tree to search | 934 | * @tree: the io tree to search |
934 | * @start: the start offset in bytes | 935 | * @start: the start offset in bytes |
935 | * @end: the end offset in bytes (inclusive) | 936 | * @end: the end offset in bytes (inclusive) |
diff --git a/include/linux/clk.h b/include/linux/clk.h index ad5c43e8ae8..f6fb40c8bf9 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h | |||
@@ -86,7 +86,7 @@ int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb); | |||
86 | /** | 86 | /** |
87 | * clk_get - lookup and obtain a reference to a clock producer. | 87 | * clk_get - lookup and obtain a reference to a clock producer. |
88 | * @dev: device for clock "consumer" | 88 | * @dev: device for clock "consumer" |
89 | * @id: clock comsumer ID | 89 | * @id: clock consumer ID |
90 | * | 90 | * |
91 | * Returns a struct clk corresponding to the clock producer, or | 91 | * Returns a struct clk corresponding to the clock producer, or |
92 | * valid IS_ERR() condition containing errno. The implementation | 92 | * valid IS_ERR() condition containing errno. The implementation |
@@ -103,7 +103,7 @@ struct clk *clk_get(struct device *dev, const char *id); | |||
103 | /** | 103 | /** |
104 | * devm_clk_get - lookup and obtain a managed reference to a clock producer. | 104 | * devm_clk_get - lookup and obtain a managed reference to a clock producer. |
105 | * @dev: device for clock "consumer" | 105 | * @dev: device for clock "consumer" |
106 | * @id: clock comsumer ID | 106 | * @id: clock consumer ID |
107 | * | 107 | * |
108 | * Returns a struct clk corresponding to the clock producer, or | 108 | * Returns a struct clk corresponding to the clock producer, or |
109 | * valid IS_ERR() condition containing errno. The implementation | 109 | * valid IS_ERR() condition containing errno. The implementation |
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 68c569fcbb6..458988bd55a 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
@@ -188,7 +188,7 @@ static inline int is_unevictable_lru(enum lru_list lru) | |||
188 | struct zone_reclaim_stat { | 188 | struct zone_reclaim_stat { |
189 | /* | 189 | /* |
190 | * The pageout code in vmscan.c keeps track of how many of the | 190 | * The pageout code in vmscan.c keeps track of how many of the |
191 | * mem/swap backed and file backed pages are refeferenced. | 191 | * mem/swap backed and file backed pages are referenced. |
192 | * The higher the rotated/scanned ratio, the more valuable | 192 | * The higher the rotated/scanned ratio, the more valuable |
193 | * that cache is. | 193 | * that cache is. |
194 | * | 194 | * |
diff --git a/lib/div64.c b/lib/div64.c index 3ea24907d52..a163b6caef7 100644 --- a/lib/div64.c +++ b/lib/div64.c | |||
@@ -87,7 +87,7 @@ EXPORT_SYMBOL(div_s64_rem); | |||
87 | * by the book 'Hacker's Delight'. The original source and full proof | 87 | * by the book 'Hacker's Delight'. The original source and full proof |
88 | * can be found here and is available for use without restriction. | 88 | * can be found here and is available for use without restriction. |
89 | * | 89 | * |
90 | * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c' | 90 | * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt' |
91 | */ | 91 | */ |
92 | #ifndef div64_u64 | 92 | #ifndef div64_u64 |
93 | u64 div64_u64(u64 dividend, u64 divisor) | 93 | u64 div64_u64(u64 dividend, u64 divisor) |
diff --git a/mm/vmscan.c b/mm/vmscan.c index 66e431060c0..347b3ff2a47 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -1567,7 +1567,8 @@ static int vmscan_swappiness(struct scan_control *sc) | |||
1567 | * by looking at the fraction of the pages scanned we did rotate back | 1567 | * by looking at the fraction of the pages scanned we did rotate back |
1568 | * onto the active list instead of evict. | 1568 | * onto the active list instead of evict. |
1569 | * | 1569 | * |
1570 | * nr[0] = anon pages to scan; nr[1] = file pages to scan | 1570 | * nr[0] = anon inactive pages to scan; nr[1] = anon active pages to scan |
1571 | * nr[2] = file inactive pages to scan; nr[3] = file active pages to scan | ||
1571 | */ | 1572 | */ |
1572 | static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, | 1573 | static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, |
1573 | unsigned long *nr) | 1574 | unsigned long *nr) |
@@ -2537,7 +2538,7 @@ loop_again: | |||
2537 | * consider it to be no longer congested. It's | 2538 | * consider it to be no longer congested. It's |
2538 | * possible there are dirty pages backed by | 2539 | * possible there are dirty pages backed by |
2539 | * congested BDIs but as pressure is relieved, | 2540 | * congested BDIs but as pressure is relieved, |
2540 | * spectulatively avoid congestion waits | 2541 | * speculatively avoid congestion waits |
2541 | */ | 2542 | */ |
2542 | zone_clear_flag(zone, ZONE_CONGESTED); | 2543 | zone_clear_flag(zone, ZONE_CONGESTED); |
2543 | if (i <= *classzone_idx) | 2544 | if (i <= *classzone_idx) |
diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c index 63d15e8f80e..ed0c0431fcd 100644 --- a/net/core/netprio_cgroup.c +++ b/net/core/netprio_cgroup.c | |||
@@ -234,7 +234,7 @@ static int write_priomap(struct cgroup *cgrp, struct cftype *cft, | |||
234 | 234 | ||
235 | /* | 235 | /* |
236 | *Separate the devname from the associated priority | 236 | *Separate the devname from the associated priority |
237 | *and advance the priostr poitner to the priority value | 237 | *and advance the priostr pointer to the priority value |
238 | */ | 238 | */ |
239 | *priostr = '\0'; | 239 | *priostr = '\0'; |
240 | priostr++; | 240 | priostr++; |
diff --git a/scripts/mksysmap b/scripts/mksysmap index 6e133a0bae7..c1b6191ef87 100644 --- a/scripts/mksysmap +++ b/scripts/mksysmap | |||
@@ -16,7 +16,7 @@ | |||
16 | # The second row specify the type of the symbol: | 16 | # The second row specify the type of the symbol: |
17 | # A = Absolute | 17 | # A = Absolute |
18 | # B = Uninitialised data (.bss) | 18 | # B = Uninitialised data (.bss) |
19 | # C = Comon symbol | 19 | # C = Common symbol |
20 | # D = Initialised data | 20 | # D = Initialised data |
21 | # G = Initialised data for small objects | 21 | # G = Initialised data for small objects |
22 | # I = Indirect reference to another symbol | 22 | # I = Indirect reference to another symbol |
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index 643f1113b1d..7e814a5c367 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c | |||
@@ -438,7 +438,7 @@ static __inline__ void li_writeb(lithium_t *lith, int off, unsigned char val) | |||
438 | * | 438 | * |
439 | * Observe that (mask & -mask) is (1 << low_set_bit_of(mask)). | 439 | * Observe that (mask & -mask) is (1 << low_set_bit_of(mask)). |
440 | * As long as mask is constant, we trust the compiler will change the | 440 | * As long as mask is constant, we trust the compiler will change the |
441 | * multipy and divide into shifts. | 441 | * multiply and divide into shifts. |
442 | */ | 442 | */ |
443 | 443 | ||
444 | #define SHIFT_FIELD(val, mask) (((val) * ((mask) & -(mask))) & (mask)) | 444 | #define SHIFT_FIELD(val, mask) (((val) * ((mask) & -(mask))) & (mask)) |