diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 19:12:33 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 19:12:33 +0100 |
| commit | e59d969f441fb8e25b30125bdf201153adc5a7e3 (patch) | |
| tree | e18250fbc1bc9e2ca864292d2390325f8ac84c80 /arch/arm/configs | |
| parent | 4ddb1c295752252f61670e35c791bf16e58bbce6 (diff) | |
| parent | f6f94f6660dbe34039e5c86a46c7845589e7ee0c (diff) | |
| download | linux-3.10-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.gz linux-3.10-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.bz2 linux-3.10-e59d969f441fb8e25b30125bdf201153adc5a7e3.zip | |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/at91_dt_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index 67bc571ed0c..b175577d7ab 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig @@ -111,6 +111,7 @@ CONFIG_I2C=y CONFIG_I2C_GPIO=y CONFIG_SPI=y CONFIG_SPI_ATMEL=y +CONFIG_PINCTRL_AT91=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_AT91SAM9X_WATCHDOG=y |