diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /arch/arm/mach-at91 | |
parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (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: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/at91cap9_devices.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9rl_devices.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index 9ffbf3a2dfea..21020ceb2f3a 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c | |||
@@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) | |||
171 | */ | 171 | */ |
172 | usba_udc_data.pdata.vbus_pin = -EINVAL; | 172 | usba_udc_data.pdata.vbus_pin = -EINVAL; |
173 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); | 173 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); |
174 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; | 174 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); |
175 | 175 | ||
176 | if (data && data->vbus_pin > 0) { | 176 | if (data && data->vbus_pin > 0) { |
177 | at91_set_gpio_input(data->vbus_pin, 0); | 177 | at91_set_gpio_input(data->vbus_pin, 0); |
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 1e8f275c17f6..5e9f8a4c38df 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
@@ -256,7 +256,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) | |||
256 | { | 256 | { |
257 | usba_udc_data.pdata.vbus_pin = -EINVAL; | 257 | usba_udc_data.pdata.vbus_pin = -EINVAL; |
258 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); | 258 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); |
259 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; | 259 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); |
260 | 260 | ||
261 | if (data && data->vbus_pin > 0) { | 261 | if (data && data->vbus_pin > 0) { |
262 | at91_set_gpio_input(data->vbus_pin, 0); | 262 | at91_set_gpio_input(data->vbus_pin, 0); |
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c index 53aaa94df75a..c49262bddd85 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c | |||
@@ -145,7 +145,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) | |||
145 | */ | 145 | */ |
146 | usba_udc_data.pdata.vbus_pin = -EINVAL; | 146 | usba_udc_data.pdata.vbus_pin = -EINVAL; |
147 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); | 147 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); |
148 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; | 148 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); |
149 | 149 | ||
150 | if (data && data->vbus_pin > 0) { | 150 | if (data && data->vbus_pin > 0) { |
151 | at91_set_gpio_input(data->vbus_pin, 0); | 151 | at91_set_gpio_input(data->vbus_pin, 0); |