git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-n30.c
diff --git
a/arch/arm/mach-s3c2410/mach-n30.c
b/arch/arm/mach-s3c2410/mach-n30.c
index 0405712c22634b8a4915afcd7ad1fa94c49a1ef0..684710f8814277a46d4ecceb50de23d4c39e74e9 100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-n30.c
+++ b/
arch/arm/mach-s3c2410/mach-n30.c
@@
-322,7
+322,7
@@
static struct platform_device *n30_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_iis,
- &s3c_device_
usb
,
+ &s3c_device_
ohci
,
&s3c_device_usbgadget,
&n30_button_device,
&n30_blue_led,