diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 17:14:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 17:14:17 +0100 |
| commit | 244acb1ba3777c2eb4d33ddc246cab5419656442 (patch) | |
| tree | d2fa55c9f789afb9b1aff57067be1f9190ffc9e7 /arch/arm/mach-nomadik/Kconfig | |
| parent | cb8db5d4578ac9d996200ab59aa655344d305f5b (diff) | |
| parent | 93e22567a138783202143c3af70d701a3ad20629 (diff) | |
| download | talos-op-linux-244acb1ba3777c2eb4d33ddc246cab5419656442.tar.gz talos-op-linux-244acb1ba3777c2eb4d33ddc246cab5419656442.zip | |
Merge branch 'config' into late-for-linus
Diffstat (limited to 'arch/arm/mach-nomadik/Kconfig')
| -rw-r--r-- | arch/arm/mach-nomadik/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig index 365879b47c0e..c744946ef022 100644 --- a/arch/arm/mach-nomadik/Kconfig +++ b/arch/arm/mach-nomadik/Kconfig @@ -4,8 +4,8 @@ menu "Nomadik boards" config MACH_NOMADIK_8815NHK bool "ST 8815 Nomadik Hardware Kit (evaluation board)" - select NOMADIK_8815 select HAS_MTU + select NOMADIK_8815 endmenu @@ -16,7 +16,7 @@ config I2C_BITBANG_8815NHK tristate "Driver for bit-bang busses found on the 8815 NHK" depends on I2C && MACH_NOMADIK_8815NHK depends on PINCTRL_NOMADIK - select I2C_ALGOBIT default y + select I2C_ALGOBIT endif |
