diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-01 10:16:00 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-01 10:16:04 +0100 |
commit | fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5 (patch) | |
tree | 1d3f38534ab1ac7672d0c33e5c7328f4f2c07f6b /arch/arm/mach-pxa/mioa701.c | |
parent | 8954bb0da99b76c7ce5edf2f314807cff68b6ea8 (diff) | |
parent | cdb4acc0568f4f6e10e778f0c2cd04fcd4786c09 (diff) | |
download | blackbird-op-linux-fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5.tar.gz blackbird-op-linux-fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5.zip |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/mioa701.c')
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index d60db87dde08..fa6a708b4099 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c @@ -697,7 +697,7 @@ static struct i2c_board_info __initdata mioa701_pi2c_devices[] = { }; /* Board I2C devices. */ -static struct i2c_board_info __initdata mioa701_i2c_devices[] = { +static struct i2c_board_info mioa701_i2c_devices[] = { { I2C_BOARD_INFO("mt9m111", 0x5d), }, |