diff options
| author | Arnd Bergmann | 2012-02-22 15:20:07 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-02-22 15:20:18 +0100 |
| commit | 2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f (patch) | |
| tree | ab89c74c09c2986fa01c25ad8e45989a48a18899 /arch/arm/plat-samsung | |
| parent | Merge branch 'v3.4-next/devel-samsung-rtc' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | ARM: LPC32xx: ADC support for mach-lpc32xx (diff) | |
| download | kernel-qcow2-linux-2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f.tar.gz kernel-qcow2-linux-2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f.tar.xz kernel-qcow2-linux-2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f.zip | |
Merge branch 'lpc32xx/drivers' into next/drivers
* lpc32xx/drivers: (566 commits)
ARM: LPC32xx: ADC support for mach-lpc32xx
Includes an update to Linux 3.3-rc4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/devs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 32a6e394db24..f10768e988d4 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -468,8 +468,10 @@ void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd) { struct s3c2410_platform_i2c *npd; - if (!pd) + if (!pd) { pd = &default_i2c_data; + pd->bus_num = 0; + } npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c), &s3c_device_i2c0); |