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 'master' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-bast.c
diff --git
a/arch/arm/mach-s3c2410/mach-bast.c
b/arch/arm/mach-s3c2410/mach-bast.c
index
97162fd
..
02b1b62
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-bast.c
+++ b/
arch/arm/mach-s3c2410/mach-bast.c
@@
-584,7
+584,7
@@
static struct s3c_hwmon_pdata bast_hwmon_info = {
// cat /sys/devices/platform/s3c24xx-adc/s3c-hwmon/in_0
static struct platform_device *bast_devices[] __initdata = {
- &s3c_device_
usb
,
+ &s3c_device_
ohci
,
&s3c_device_lcd,
&s3c_device_wdt,
&s3c_device_i2c0,