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' of ../mmc
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2440
/
mach-nexcoder.c
diff --git
a/arch/arm/mach-s3c2440/mach-nexcoder.c
b/arch/arm/mach-s3c2440/mach-nexcoder.c
index
a546307
..
7aeaa97
100644
(file)
--- a/
arch/arm/mach-s3c2440/mach-nexcoder.c
+++ b/
arch/arm/mach-s3c2440/mach-nexcoder.c
@@
-37,6
+37,7
@@
//#include <asm/debug-ll.h>
#include <mach/regs-gpio.h>
#include <plat/regs-serial.h>
//#include <asm/debug-ll.h>
#include <mach/regs-gpio.h>
#include <plat/regs-serial.h>
+#include <plat/iic.h>
#include <plat/s3c2410.h>
#include <plat/s3c2440.h>
#include <plat/s3c2410.h>
#include <plat/s3c2440.h>
@@
-107,7
+108,7
@@
static struct platform_device *nexcoder_devices[] __initdata = {
&s3c_device_usb,
&s3c_device_lcd,
&s3c_device_wdt,
&s3c_device_usb,
&s3c_device_lcd,
&s3c_device_wdt,
- &s3c_device_i2c,
+ &s3c_device_i2c
0
,
&s3c_device_iis,
&s3c_device_rtc,
&s3c_device_camif,
&s3c_device_iis,
&s3c_device_rtc,
&s3c_device_camif,
@@
-142,6
+143,7
@@
static void __init nexcoder_map_io(void)
static void __init nexcoder_init(void)
{
static void __init nexcoder_init(void)
{
+ s3c_i2c0_set_platdata(NULL);
platform_add_devices(nexcoder_devices, ARRAY_SIZE(nexcoder_devices));
};
platform_add_devices(nexcoder_devices, ARRAY_SIZE(nexcoder_devices));
};