summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-02 17:47:31 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-02 17:47:31 +0200
commitd268d2da2af6a37926b1f14c415bf9c04ad0d252 (patch)
tree7a887840d1d1168cbfa4fe0d05a87931f02da3df /arch
parentMerge tag 'samsung-defconfig-4.9' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentARM: omap2plus_defconfig: switch to the IIO BMP085 driver (diff)
downloadlinux-d268d2da2af6a37926b1f14c415bf9c04ad0d252.tar.xz
linux-d268d2da2af6a37926b1f14c415bf9c04ad0d252.zip
Merge tag 'omap-for-v4.9/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig
Merge "omap defconfig updates for v4.9 merge window" from Tony Lindgren: A patch from Linus Walleij <linus.walleij@linaro.org> to switch to use generic IIO BMP280 driver instead of the BMP085. * tag 'omap-for-v4.9/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2plus_defconfig: switch to the IIO BMP085 driver
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/omap2plus_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 487c6c3b13fd..53e1a884a1ea 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -139,7 +139,6 @@ CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=16384
CONFIG_SENSORS_TSL2550=m
-CONFIG_BMP085_I2C=m
CONFIG_SRAM=y
CONFIG_EEPROM_AT24=m
CONFIG_SENSORS_LIS3_I2C=m
@@ -428,6 +427,7 @@ CONFIG_EXTCON_USB_GPIO=m
CONFIG_TI_EMIF=m
CONFIG_IIO=m
CONFIG_TI_AM335X_ADC=m
+CONFIG_BMP280=m
CONFIG_PWM=y
CONFIG_PWM_OMAP_DMTIMER=m
CONFIG_PWM_TIECAP=m