diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2015-11-04 12:31:27 +0300 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2015-11-04 12:31:27 +0300 |
| commit | 20cbdf7d5f1fcc75ed2dca030395550a58652332 (patch) | |
| tree | 1b2f67e47ddfe781e589261a53ff8e2b8a26550d | |
| parent | d7d2c27217f76bbe03283b169c76db812a797a6c (diff) | |
| parent | 52e5f4d262a0d464221fdc4407ab7c77dda9d6f8 (diff) | |
| download | linux-dev.tar.xz | |
Merge pull request #15 from jk-ozlabs/openbmc/config-fixesopenbmc-20151104-1dev
Openbmc/config fixes
| -rw-r--r-- | arch/arm/configs/aspeed_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/configs/aspeed_defconfig b/arch/arm/configs/aspeed_defconfig index fa8e8a13a95c..5899b6c87354 100644 --- a/arch/arm/configs/aspeed_defconfig +++ b/arch/arm/configs/aspeed_defconfig @@ -65,6 +65,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_ASPEED_BT_IPMI_HOST=y +CONFIG_EEPROM_AT24=y CONFIG_EEPROM_93CX6=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y @@ -125,13 +126,10 @@ CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_SLAVE_EEPROM=y -CONFIG_I2C_DEBUG_CORE=y -CONFIG_I2C_DEBUG_ALGO=y -CONFIG_I2C_DEBUG_BUS=y CONFIG_SPI=y CONFIG_DEBUG_PINCTRL=y CONFIG_GPIO_ASPEED=y -# CONFIG_HWMON is not set +CONFIG_SENSORS_TMP421=y CONFIG_WATCHDOG=y CONFIG_ASPEED_24xx_WATCHDOG=y CONFIG_SSB=y |