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-s3c2410
/
mach-tct_hammer.c
diff --git
a/arch/arm/mach-s3c2410/mach-tct_hammer.c
b/arch/arm/mach-s3c2410/mach-tct_hammer.c
index
8fdb043
..
929164a
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-tct_hammer.c
+++ b/
arch/arm/mach-s3c2410/mach-tct_hammer.c
@@
-129,7
+129,7
@@
static struct platform_device *tct_hammer_devices[] __initdata = {
&s3c_device_adc,
&s3c_device_wdt,
&s3c_device_i2c0,
- &s3c_device_
usb
,
+ &s3c_device_
ohci
,
&s3c_device_rtc,
&s3c_device_usbgadget,
&s3c_device_sdi,