diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-30 19:06:56 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-30 19:06:56 -0400 |
| commit | 63bda79dc484c015f9902f2c8ae019952b93f876 (patch) | |
| tree | 8ac8535163e54fb7d44c29072c8242608832b0c3 /arch/arm/mach-s3c64xx/mach-crag6410.c | |
| parent | 929d138a3ba776145d2f421c2c4f16d922535090 (diff) | |
| parent | be76871ed3ec0f4571704f07d0bd73c74cf00ddc (diff) | |
Merge branch 'late/board' into devel-late
* late/board:
ARM: S3C64XX: Hook up carrier class modules on Cragganmore
ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-crag6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index eda5e027b109..6b20a71d7dbf 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
| @@ -671,6 +671,7 @@ static struct i2c_board_info i2c_devs1[] __initdata = { | |||
| 671 | .irq = S3C_EINT(0), | 671 | .irq = S3C_EINT(0), |
| 672 | .platform_data = &glenfarclas_pmic_pdata }, | 672 | .platform_data = &glenfarclas_pmic_pdata }, |
| 673 | 673 | ||
| 674 | { I2C_BOARD_INFO("wlf-gf-module", 0x22) }, | ||
| 674 | { I2C_BOARD_INFO("wlf-gf-module", 0x24) }, | 675 | { I2C_BOARD_INFO("wlf-gf-module", 0x24) }, |
| 675 | { I2C_BOARD_INFO("wlf-gf-module", 0x25) }, | 676 | { I2C_BOARD_INFO("wlf-gf-module", 0x25) }, |
| 676 | { I2C_BOARD_INFO("wlf-gf-module", 0x26) }, | 677 | { I2C_BOARD_INFO("wlf-gf-module", 0x26) }, |