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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-qt2410.c
diff --git
a/arch/arm/mach-s3c2410/mach-qt2410.c
b/arch/arm/mach-s3c2410/mach-qt2410.c
index ab092bcda393a5e9287e1b3e35ad19775ddb3cca..92a4ec375d82aa3f50f52e75e4db90ce773de1e3 100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/
arch/arm/mach-s3c2410/mach-qt2410.c
@@
-246,7
+246,7
@@
static struct platform_device qt2410_spi = {
/* Board devices */
static struct platform_device *qt2410_devices[] __initdata = {
- &s3c_device_
usb
,
+ &s3c_device_
ohci
,
&s3c_device_lcd,
&s3c_device_wdt,
&s3c_device_i2c0,