Skip to content

Commit

Permalink
Merge pull request #15 from jk-ozlabs/openbmc/config-fixes
Browse files Browse the repository at this point in the history
Openbmc/config fixes
  • Loading branch information
jk-ozlabs committed Nov 4, 2015
2 parents d7d2c27 + 52e5f4d commit 20cbdf7
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions arch/arm/configs/aspeed_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 20cbdf7

Please sign in to comment.