diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-27 17:11:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-27 17:11:32 -0500 |
| commit | a814290e17ae314bd614476cffc6119846eca27e (patch) | |
| tree | 9fc40e6a34cd275bedcd2344383bd5e84f6c20df /arch/arm/mach-s3c2440/mach-nexcoder.c | |
| parent | e55d1936f207f81c4e225d6c513e0fa487e544c5 (diff) | |
| parent | ab5d97db1c6ced3e95c00d097931471707032b1f (diff) | |
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-nexcoder.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-nexcoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c index d43edede590..86a243b3e37 100644 --- a/arch/arm/mach-s3c2440/mach-nexcoder.c +++ b/arch/arm/mach-s3c2440/mach-nexcoder.c | |||
| @@ -106,7 +106,7 @@ static struct platform_device nexcoder_device_nor = { | |||
| 106 | /* Standard Nexcoder devices */ | 106 | /* Standard Nexcoder devices */ |
| 107 | 107 | ||
| 108 | static struct platform_device *nexcoder_devices[] __initdata = { | 108 | static struct platform_device *nexcoder_devices[] __initdata = { |
| 109 | &s3c_device_usb, | 109 | &s3c_device_ohci, |
| 110 | &s3c_device_lcd, | 110 | &s3c_device_lcd, |
| 111 | &s3c_device_wdt, | 111 | &s3c_device_wdt, |
| 112 | &s3c_device_i2c0, | 112 | &s3c_device_i2c0, |