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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2412
/
mach-jive.c
diff --git
a/arch/arm/mach-s3c2412/mach-jive.c
b/arch/arm/mach-s3c2412/mach-jive.c
index
c9fa3fc
..
14f4798
100644
(file)
--- a/
arch/arm/mach-s3c2412/mach-jive.c
+++ b/
arch/arm/mach-s3c2412/mach-jive.c
@@
-468,7
+468,7
@@
static struct i2c_board_info jive_i2c_devs[] __initdata = {
/* The platform devices being used. */
static struct platform_device *jive_devices[] __initdata = {
- &s3c_device_
usb
,
+ &s3c_device_
ohci
,
&s3c_device_rtc,
&s3c_device_wdt,
&s3c_device_i2c0,