diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/mach-s3c2410/mach-tct_hammer.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-tct_hammer.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-tct_hammer.c b/arch/arm/mach-s3c2410/mach-tct_hammer.c index 8fdb0430bd48..929164a8e9b1 100644 --- 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 = { | |||
| 129 | &s3c_device_adc, | 129 | &s3c_device_adc, |
| 130 | &s3c_device_wdt, | 130 | &s3c_device_wdt, |
| 131 | &s3c_device_i2c0, | 131 | &s3c_device_i2c0, |
| 132 | &s3c_device_usb, | 132 | &s3c_device_ohci, |
| 133 | &s3c_device_rtc, | 133 | &s3c_device_rtc, |
| 134 | &s3c_device_usbgadget, | 134 | &s3c_device_usbgadget, |
| 135 | &s3c_device_sdi, | 135 | &s3c_device_sdi, |