diff options
| author | Qinggang Zhou <qzhou@nvidia.com> | 2011-03-16 03:44:47 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-03-17 20:46:20 -0800 |
| commit | 4c2ab25e208b62f0df5fdfd360f427c046fcebf9 (patch) | |
| tree | 964e078a72fd61b7c40b50f7711aa9b297ef1060 | |
| parent | 6c36cc7bc41b972ce82fdc77abb72257f66f1219 (diff) | |
ARM: defconfig: add the configuration for SH532U focuser
bug 778859
Change-Id: Id7429db0cf8495cd27a8a9c72dcf80bb7a2091c4
Reviewed-on: http://git-master/r/23166
Reviewed-by: Qinggang Zhou <qzhou@nvidia.com>
Tested-by: Qinggang Zhou <qzhou@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
| -rw-r--r-- | arch/arm/configs/tegra_android_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig index 0e04259896b9..bcabc7dfa961 100644 --- a/arch/arm/configs/tegra_android_defconfig +++ b/arch/arm/configs/tegra_android_defconfig @@ -205,7 +205,6 @@ CONFIG_PPP_BSDCOMP=y CONFIG_PPP_MPPE=y CONFIG_PPPOLAC=y CONFIG_PPPOPNS=y -CONFIG_SLHC=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_KEYRESET=y @@ -254,6 +253,7 @@ CONFIG_VIDEO_DEV=y CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_OV5650=y CONFIG_VIDEO_OV2710=y +CONFIG_VIDEO_SH532U=y CONFIG_USB_VIDEO_CLASS=y # CONFIG_USB_GSPCA is not set CONFIG_VIDEO_OUTPUT_CONTROL=y @@ -276,7 +276,7 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_SUSPEND=y CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_TEGRA_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_ACM=y CONFIG_USB_WDM=y CONFIG_USB_STORAGE=y diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 23214a106068..bcabc7dfa961 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -205,7 +205,6 @@ CONFIG_PPP_BSDCOMP=y CONFIG_PPP_MPPE=y CONFIG_PPPOLAC=y CONFIG_PPPOPNS=y -CONFIG_SLHC=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_KEYRESET=y @@ -254,6 +253,7 @@ CONFIG_VIDEO_DEV=y CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_OV5650=y CONFIG_VIDEO_OV2710=y +CONFIG_VIDEO_SH532U=y CONFIG_USB_VIDEO_CLASS=y # CONFIG_USB_GSPCA is not set CONFIG_VIDEO_OUTPUT_CONTROL=y |