diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
| commit | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (patch) | |
| tree | 7ffdb0ad4c35ac9c19c4096b4f22ccc9b1eeefad /arch/arm/configs/at91sam9rlek_defconfig | |
| parent | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (diff) | |
| parent | 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (diff) | |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/configs/at91sam9rlek_defconfig')
| -rw-r--r-- | arch/arm/configs/at91sam9rlek_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/at91sam9rlek_defconfig b/arch/arm/configs/at91sam9rlek_defconfig index 1c76642272a1..811bebbdc784 100644 --- a/arch/arm/configs/at91sam9rlek_defconfig +++ b/arch/arm/configs/at91sam9rlek_defconfig | |||
| @@ -496,6 +496,7 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
| 496 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | 496 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set |
| 497 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | 497 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
| 498 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 498 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
| 499 | CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y | ||
| 499 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | 500 | # CONFIG_TOUCHSCREEN_UCB1400 is not set |
| 500 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 501 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
| 501 | # CONFIG_INPUT_MISC is not set | 502 | # CONFIG_INPUT_MISC is not set |