diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:09:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:09:55 -0700 |
| commit | 13e356c977473baeb29e8abfd992f0cd938a78ce (patch) | |
| tree | 7aefdefbe380d554c7c06fbed3f9663cc02d5b92 /arch/arm/mach-omap2/board-rx51-peripherals.c | |
| parent | dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3 (diff) | |
| parent | 15605236740c38b51d67faf060851bfdc5c6b5fc (diff) | |
| download | kernel_samsung_espresso10-13e356c977473baeb29e8abfd992f0cd938a78ce.zip kernel_samsung_espresso10-13e356c977473baeb29e8abfd992f0cd938a78ce.tar.gz kernel_samsung_espresso10-13e356c977473baeb29e8abfd992f0cd938a78ce.tar.bz2 | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
OMAP2xxx clock: set up clockdomain pointer in struct clk
OMAP: Fix race condition with autodeps
omap: McBSP: Fix incorrect receiver stop in omap_mcbsp_stop
omap: Initialization of SDRC params on Zoom2
omap: RX-51: Drop I2C-1 speed to 2200
omap: SDMA: Fixing bug in omap_dma_set_global_params()
omap: CONFIG_ISP1301_OMAP redefined in Beagle defconfig
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index c1af532..2b0eb1b 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -444,7 +444,7 @@ static int __init rx51_i2c_init(void) rx51_twldata.vaux3 = &rx51_vaux3_cam; rx51_twldata.vmmc2 = &rx51_vmmc2; } - omap_register_i2c_bus(1, 2600, rx51_peripherals_i2c_board_info_1, + omap_register_i2c_bus(1, 2200, rx51_peripherals_i2c_board_info_1, ARRAY_SIZE(rx51_peripherals_i2c_board_info_1)); omap_register_i2c_bus(2, 100, NULL, 0); omap_register_i2c_bus(3, 400, NULL, 0); |