diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:36:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:36:49 -0500 |
| commit | 14a3c4ab0e58d143c7928c9eb2f2610205e13bf2 (patch) | |
| tree | 885992999d7a1a2fd3586efcf32ebcbcbc3a72aa /arch/arm/mach-s3c2440/mach-smdk2440.c | |
| parent | 1af237a099a3b8ff56aa384f605c6a68af7bf288 (diff) | |
| parent | 47992cbdaef2f18a47871b2ed01ad27f568c8b73 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
[ARM] pxafb: cleanup of the timing checking code
[ARM] pxafb: cleanup of the color format manipulation code
[ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
[ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
[ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
[ARM] pxafb: allow video memory size to be configurable
[ARM] pxa: add document on the MFP design and how to use it
[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
[ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
[ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
[ARM] pxa: Update eseries defconfig
[ARM] 5352/1: add w90p910-plat config file
[ARM] s3c: S3C options should depend on PLAT_S3C
[ARM] mv78xx0: implement GPIO and GPIO interrupt support
[ARM] Kirkwood: implement GPIO and GPIO interrupt support
[ARM] Orion: share GPIO IRQ handling code
[ARM] Orion: share GPIO handling code
[ARM] s3c: define __io using the typesafe version
[ARM] S3C64XX: Ensure CPU_V6 is selected
...
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-smdk2440.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-smdk2440.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c index fefeaaa4155f..db6eafbd4d90 100644 --- a/arch/arm/mach-s3c2440/mach-smdk2440.c +++ b/arch/arm/mach-s3c2440/mach-smdk2440.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | #include <mach/idle.h> | 38 | #include <mach/idle.h> |
| 39 | #include <mach/fb.h> | 39 | #include <mach/fb.h> |
| 40 | #include <plat/iic.h> | ||
| 40 | 41 | ||
| 41 | #include <plat/s3c2410.h> | 42 | #include <plat/s3c2410.h> |
| 42 | #include <plat/s3c2440.h> | 43 | #include <plat/s3c2440.h> |
| @@ -152,7 +153,7 @@ static struct platform_device *smdk2440_devices[] __initdata = { | |||
| 152 | &s3c_device_usb, | 153 | &s3c_device_usb, |
| 153 | &s3c_device_lcd, | 154 | &s3c_device_lcd, |
| 154 | &s3c_device_wdt, | 155 | &s3c_device_wdt, |
| 155 | &s3c_device_i2c, | 156 | &s3c_device_i2c0, |
| 156 | &s3c_device_iis, | 157 | &s3c_device_iis, |
| 157 | }; | 158 | }; |
| 158 | 159 | ||
| @@ -166,6 +167,7 @@ static void __init smdk2440_map_io(void) | |||
| 166 | static void __init smdk2440_machine_init(void) | 167 | static void __init smdk2440_machine_init(void) |
| 167 | { | 168 | { |
| 168 | s3c24xx_fb_set_platdata(&smdk2440_fb_info); | 169 | s3c24xx_fb_set_platdata(&smdk2440_fb_info); |
| 170 | s3c_i2c0_set_platdata(NULL); | ||
| 169 | 171 | ||
| 170 | platform_add_devices(smdk2440_devices, ARRAY_SIZE(smdk2440_devices)); | 172 | platform_add_devices(smdk2440_devices, ARRAY_SIZE(smdk2440_devices)); |
| 171 | smdk_machine_init(); | 173 | smdk_machine_init(); |