Skip to content

Commit

Permalink
Merge remote-tracking branch 'andrew/openbmc/aspeed-kconfig' into dev…
Browse files Browse the repository at this point in the history
…-4.3
  • Loading branch information
Joel Stanley committed Dec 21, 2015
2 parents 4b62e60 + 0f78ecd commit 13df9e0
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/gpio/Kconfig
Original file line number Diff line number Diff line change
@@ -121,7 +121,7 @@ config GPIO_ALTERA

config GPIO_ASPEED
bool "Aspeed AST2400 GPIO support"
depends on ARCH_ASPEED && OF
depends on (ARCH_ASPEED || COMPILE_TEST) && OF
select GENERIC_IRQ_CHIP
help
Say Y here to support Aspeed AST2400 GPIO.
2 changes: 1 addition & 1 deletion drivers/i2c/busses/Kconfig
Original file line number Diff line number Diff line change
@@ -976,7 +976,7 @@ config I2C_RCAR

config I2C_ASPEED
tristate "Aspeed AST2xxx SoC I2C Controller"
depends on ARCH_ASPEED
depends on ARCH_ASPEED || COMPILE_TEST
select I2C_SLAVE
help
If you say yes to this option, support will be included for the
2 changes: 1 addition & 1 deletion drivers/watchdog/Kconfig
Original file line number Diff line number Diff line change
@@ -580,7 +580,7 @@ config LPC18XX_WATCHDOG

config ASPEED_24xx_WATCHDOG
tristate "Aspeed 23xx 24xx SoCs watchdog support"
depends on ARCH_ASPEED
depends on ARCH_ASPEED || COMPILE_TEST
select WATCHDOG_CORE
help
Say Y here to include support for the watchdog timer

0 comments on commit 13df9e0

Please sign in to comment.