diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 13:51:48 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 13:51:48 +0200 |
commit | 67028154bebd0fae7f9b2d77a5cf7bcf5e3c8ef0 (patch) | |
tree | 6daa84a14d91ba5dc9e926d5d291e56d28c1a13c /arch/arm/configs | |
parent | 21cb7963aa4ba59efb293c6dea00e3fc291090f8 (diff) | |
parent | 06993d6a8a51b90fc78c8c3cb7a81c9b4b88c683 (diff) | |
download | linux-67028154bebd0fae7f9b2d77a5cf7bcf5e3c8ef0.tar.gz linux-67028154bebd0fae7f9b2d77a5cf7bcf5e3c8ef0.tar.bz2 linux-67028154bebd0fae7f9b2d77a5cf7bcf5e3c8ef0.zip |
Merge tag 'omap-for-v3.10/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren <tony@atomide.com>:
Board related changes for v3.10 merge window. These are pretty
much all non-critical fixes for platform device initialization
that will be needed until we can drop the board-*.c files and
move to DT based boot.
* tag 'omap-for-v3.10/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight
ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor
omap2+: Remove useless Makefile line
omap2+: Remove useless Makefile line
ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d
ARM: OMAP1: fix omap_udc registration
Includes an update to Linux 3.9-rc6
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index bd07864f14a0..33903ca0d879 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -93,6 +93,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_TSL2550=m CONFIG_SENSORS_LIS3_I2C=m +CONFIG_BMP085_I2C=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_MULTI_LUN=y |