git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-otom.c
diff --git
a/arch/arm/mach-s3c2410/mach-otom.c
b/arch/arm/mach-s3c2410/mach-otom.c
index
f6c7261
..
d8c7f2e
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-otom.c
+++ b/
arch/arm/mach-s3c2410/mach-otom.c
@@
-92,7
+92,7
@@
static struct platform_device otom_device_nor = {
/* Standard OTOM devices */
static struct platform_device *otom11_devices[] __initdata = {
- &s3c_device_
usb
,
+ &s3c_device_
ohci
,
&s3c_device_lcd,
&s3c_device_wdt,
&s3c_device_i2c0,