diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-18 03:09:38 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-18 03:09:38 -0400 |
| commit | 99d921c2ff28c6396c5fa9a5360b3005bc6abba7 (patch) | |
| tree | a2ad61badd91e899983d40d3bd34c07cd1748ef4 | |
| parent | 4505ffda54b352a08eb08ebad62ac48725c41966 (diff) | |
sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs.
The MEDIA_SUPPORT option disabled soc-camera support, so re-enable it for
the impacted defconfigs.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/configs/ap325rxa_defconfig | 51 | ||||
| -rw-r--r-- | arch/sh/configs/migor_defconfig | 51 | ||||
| -rw-r--r-- | arch/sh/configs/se7724_defconfig | 94 |
3 files changed, 190 insertions, 6 deletions
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig index 929edf727677..6c38a43594fc 100644 --- a/arch/sh/configs/ap325rxa_defconfig +++ b/arch/sh/configs/ap325rxa_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.30 | 3 | # Linux kernel version: 2.6.30 |
| 4 | # Thu Jun 18 12:20:40 2009 | 4 | # Thu Jun 18 16:04:11 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
| 7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
| @@ -831,7 +831,54 @@ CONFIG_SSB_POSSIBLE=y | |||
| 831 | # CONFIG_MFD_WM8350_I2C is not set | 831 | # CONFIG_MFD_WM8350_I2C is not set |
| 832 | # CONFIG_MFD_PCF50633 is not set | 832 | # CONFIG_MFD_PCF50633 is not set |
| 833 | # CONFIG_REGULATOR is not set | 833 | # CONFIG_REGULATOR is not set |
| 834 | # CONFIG_MEDIA_SUPPORT is not set | 834 | CONFIG_MEDIA_SUPPORT=y |
| 835 | |||
| 836 | # | ||
| 837 | # Multimedia core support | ||
| 838 | # | ||
| 839 | CONFIG_VIDEO_DEV=y | ||
| 840 | CONFIG_VIDEO_V4L2_COMMON=y | ||
| 841 | # CONFIG_VIDEO_ALLOW_V4L1 is not set | ||
| 842 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
| 843 | # CONFIG_DVB_CORE is not set | ||
| 844 | CONFIG_VIDEO_MEDIA=y | ||
| 845 | |||
| 846 | # | ||
| 847 | # Multimedia drivers | ||
| 848 | # | ||
| 849 | # CONFIG_MEDIA_ATTACH is not set | ||
| 850 | CONFIG_MEDIA_TUNER=y | ||
| 851 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set | ||
| 852 | CONFIG_MEDIA_TUNER_SIMPLE=y | ||
| 853 | CONFIG_MEDIA_TUNER_TDA8290=y | ||
| 854 | CONFIG_MEDIA_TUNER_TDA9887=y | ||
| 855 | CONFIG_MEDIA_TUNER_TEA5761=y | ||
| 856 | CONFIG_MEDIA_TUNER_TEA5767=y | ||
| 857 | CONFIG_MEDIA_TUNER_MT20XX=y | ||
| 858 | CONFIG_MEDIA_TUNER_XC2028=y | ||
| 859 | CONFIG_MEDIA_TUNER_XC5000=y | ||
| 860 | CONFIG_MEDIA_TUNER_MC44S803=y | ||
| 861 | CONFIG_VIDEO_V4L2=y | ||
| 862 | CONFIG_VIDEOBUF_GEN=y | ||
| 863 | CONFIG_VIDEOBUF_DMA_CONTIG=y | ||
| 864 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
| 865 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
| 866 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
| 867 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | ||
| 868 | # CONFIG_VIDEO_VIVI is not set | ||
| 869 | # CONFIG_VIDEO_SAA5246A is not set | ||
| 870 | # CONFIG_VIDEO_SAA5249 is not set | ||
| 871 | CONFIG_SOC_CAMERA=y | ||
| 872 | # CONFIG_SOC_CAMERA_MT9M001 is not set | ||
| 873 | # CONFIG_SOC_CAMERA_MT9M111 is not set | ||
| 874 | # CONFIG_SOC_CAMERA_MT9T031 is not set | ||
| 875 | # CONFIG_SOC_CAMERA_MT9V022 is not set | ||
| 876 | # CONFIG_SOC_CAMERA_TW9910 is not set | ||
| 877 | CONFIG_SOC_CAMERA_PLATFORM=y | ||
| 878 | CONFIG_SOC_CAMERA_OV772X=y | ||
| 879 | CONFIG_VIDEO_SH_MOBILE_CEU=y | ||
| 880 | # CONFIG_RADIO_ADAPTERS is not set | ||
| 881 | # CONFIG_DAB is not set | ||
| 835 | 882 | ||
| 836 | # | 883 | # |
| 837 | # Graphics support | 884 | # Graphics support |
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig index 0596c2b89cca..da627d22c009 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.30 | 3 | # Linux kernel version: 2.6.30 |
| 4 | # Thu Jun 18 12:32:45 2009 | 4 | # Thu Jun 18 16:06:48 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
| 7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
| @@ -804,7 +804,54 @@ CONFIG_SSB_POSSIBLE=y | |||
| 804 | # CONFIG_MFD_WM8350_I2C is not set | 804 | # CONFIG_MFD_WM8350_I2C is not set |
| 805 | # CONFIG_MFD_PCF50633 is not set | 805 | # CONFIG_MFD_PCF50633 is not set |
| 806 | # CONFIG_REGULATOR is not set | 806 | # CONFIG_REGULATOR is not set |
| 807 | # CONFIG_MEDIA_SUPPORT is not set | 807 | CONFIG_MEDIA_SUPPORT=y |
| 808 | |||
| 809 | # | ||
| 810 | # Multimedia core support | ||
| 811 | # | ||
| 812 | CONFIG_VIDEO_DEV=y | ||
| 813 | CONFIG_VIDEO_V4L2_COMMON=y | ||
| 814 | # CONFIG_VIDEO_ALLOW_V4L1 is not set | ||
| 815 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
| 816 | # CONFIG_DVB_CORE is not set | ||
| 817 | CONFIG_VIDEO_MEDIA=y | ||
| 818 | |||
| 819 | # | ||
| 820 | # Multimedia drivers | ||
| 821 | # | ||
| 822 | # CONFIG_MEDIA_ATTACH is not set | ||
| 823 | CONFIG_MEDIA_TUNER=y | ||
| 824 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set | ||
| 825 | CONFIG_MEDIA_TUNER_SIMPLE=y | ||
| 826 | CONFIG_MEDIA_TUNER_TDA8290=y | ||
| 827 | CONFIG_MEDIA_TUNER_TDA9887=y | ||
| 828 | CONFIG_MEDIA_TUNER_TEA5761=y | ||
| 829 | CONFIG_MEDIA_TUNER_TEA5767=y | ||
| 830 | CONFIG_MEDIA_TUNER_MT20XX=y | ||
| 831 | CONFIG_MEDIA_TUNER_XC2028=y | ||
| 832 | CONFIG_MEDIA_TUNER_XC5000=y | ||
| 833 | CONFIG_MEDIA_TUNER_MC44S803=y | ||
| 834 | CONFIG_VIDEO_V4L2=y | ||
| 835 | CONFIG_VIDEOBUF_GEN=y | ||
| 836 | CONFIG_VIDEOBUF_DMA_CONTIG=y | ||
| 837 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
| 838 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
| 839 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
| 840 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | ||
| 841 | # CONFIG_VIDEO_VIVI is not set | ||
| 842 | # CONFIG_VIDEO_SAA5246A is not set | ||
| 843 | # CONFIG_VIDEO_SAA5249 is not set | ||
| 844 | CONFIG_SOC_CAMERA=y | ||
| 845 | # CONFIG_SOC_CAMERA_MT9M001 is not set | ||
| 846 | # CONFIG_SOC_CAMERA_MT9M111 is not set | ||
| 847 | # CONFIG_SOC_CAMERA_MT9T031 is not set | ||
| 848 | # CONFIG_SOC_CAMERA_MT9V022 is not set | ||
| 849 | CONFIG_SOC_CAMERA_TW9910=y | ||
| 850 | # CONFIG_SOC_CAMERA_PLATFORM is not set | ||
| 851 | CONFIG_SOC_CAMERA_OV772X=y | ||
| 852 | CONFIG_VIDEO_SH_MOBILE_CEU=y | ||
| 853 | # CONFIG_RADIO_ADAPTERS is not set | ||
| 854 | # CONFIG_DAB is not set | ||
| 808 | 855 | ||
| 809 | # | 856 | # |
| 810 | # Graphics support | 857 | # Graphics support |
diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig index c5f005f88c81..3840270283e4 100644 --- a/arch/sh/configs/se7724_defconfig +++ b/arch/sh/configs/se7724_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.30 | 3 | # Linux kernel version: 2.6.30 |
| 4 | # Thu Jun 18 12:56:56 2009 | 4 | # Thu Jun 18 16:09:05 2009 |
| 5 | # | 5 | # |
| 6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
| 7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
| @@ -852,7 +852,97 @@ CONFIG_SSB_POSSIBLE=y | |||
| 852 | # CONFIG_MFD_WM8350_I2C is not set | 852 | # CONFIG_MFD_WM8350_I2C is not set |
| 853 | # CONFIG_MFD_PCF50633 is not set | 853 | # CONFIG_MFD_PCF50633 is not set |
| 854 | # CONFIG_REGULATOR is not set | 854 | # CONFIG_REGULATOR is not set |
| 855 | # CONFIG_MEDIA_SUPPORT is not set | 855 | CONFIG_MEDIA_SUPPORT=y |
| 856 | |||
| 857 | # | ||
| 858 | # Multimedia core support | ||
| 859 | # | ||
| 860 | CONFIG_VIDEO_DEV=y | ||
| 861 | CONFIG_VIDEO_V4L2_COMMON=y | ||
| 862 | # CONFIG_VIDEO_ALLOW_V4L1 is not set | ||
| 863 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
| 864 | # CONFIG_DVB_CORE is not set | ||
| 865 | CONFIG_VIDEO_MEDIA=y | ||
| 866 | |||
| 867 | # | ||
| 868 | # Multimedia drivers | ||
| 869 | # | ||
| 870 | # CONFIG_MEDIA_ATTACH is not set | ||
| 871 | CONFIG_MEDIA_TUNER=y | ||
| 872 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set | ||
| 873 | CONFIG_MEDIA_TUNER_SIMPLE=y | ||
| 874 | CONFIG_MEDIA_TUNER_TDA8290=y | ||
| 875 | CONFIG_MEDIA_TUNER_TDA9887=y | ||
| 876 | CONFIG_MEDIA_TUNER_TEA5761=y | ||
| 877 | CONFIG_MEDIA_TUNER_TEA5767=y | ||
| 878 | CONFIG_MEDIA_TUNER_MT20XX=y | ||
| 879 | CONFIG_MEDIA_TUNER_XC2028=y | ||
| 880 | CONFIG_MEDIA_TUNER_XC5000=y | ||
| 881 | CONFIG_MEDIA_TUNER_MC44S803=y | ||
| 882 | CONFIG_VIDEO_V4L2=y | ||
| 883 | CONFIG_VIDEOBUF_GEN=y | ||
| 884 | CONFIG_VIDEOBUF_DMA_CONTIG=y | ||
| 885 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
| 886 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
| 887 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
| 888 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | ||
| 889 | # CONFIG_VIDEO_VIVI is not set | ||
| 890 | # CONFIG_VIDEO_SAA5246A is not set | ||
| 891 | # CONFIG_VIDEO_SAA5249 is not set | ||
| 892 | CONFIG_SOC_CAMERA=y | ||
| 893 | # CONFIG_SOC_CAMERA_MT9M001 is not set | ||
| 894 | # CONFIG_SOC_CAMERA_MT9M111 is not set | ||
| 895 | # CONFIG_SOC_CAMERA_MT9T031 is not set | ||
| 896 | # CONFIG_SOC_CAMERA_MT9V022 is not set | ||
| 897 | # CONFIG_SOC_CAMERA_TW9910 is not set | ||
| 898 | # CONFIG_SOC_CAMERA_PLATFORM is not set | ||
| 899 | CONFIG_SOC_CAMERA_OV772X=y | ||
| 900 | CONFIG_VIDEO_SH_MOBILE_CEU=y | ||
| 901 | CONFIG_V4L_USB_DRIVERS=y | ||
| 902 | # CONFIG_USB_VIDEO_CLASS is not set | ||
| 903 | CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | ||
| 904 | CONFIG_USB_GSPCA=m | ||
| 905 | # CONFIG_USB_M5602 is not set | ||
| 906 | # CONFIG_USB_STV06XX is not set | ||
| 907 | # CONFIG_USB_GSPCA_CONEX is not set | ||
| 908 | # CONFIG_USB_GSPCA_ETOMS is not set | ||
| 909 | # CONFIG_USB_GSPCA_FINEPIX is not set | ||
| 910 | # CONFIG_USB_GSPCA_MARS is not set | ||
| 911 | # CONFIG_USB_GSPCA_MR97310A is not set | ||
| 912 | # CONFIG_USB_GSPCA_OV519 is not set | ||
| 913 | # CONFIG_USB_GSPCA_OV534 is not set | ||
| 914 | # CONFIG_USB_GSPCA_PAC207 is not set | ||
| 915 | # CONFIG_USB_GSPCA_PAC7311 is not set | ||
| 916 | # CONFIG_USB_GSPCA_SONIXB is not set | ||
| 917 | # CONFIG_USB_GSPCA_SONIXJ is not set | ||
| 918 | # CONFIG_USB_GSPCA_SPCA500 is not set | ||
| 919 | # CONFIG_USB_GSPCA_SPCA501 is not set | ||
| 920 | # CONFIG_USB_GSPCA_SPCA505 is not set | ||
| 921 | # CONFIG_USB_GSPCA_SPCA506 is not set | ||
| 922 | # CONFIG_USB_GSPCA_SPCA508 is not set | ||
| 923 | # CONFIG_USB_GSPCA_SPCA561 is not set | ||
| 924 | # CONFIG_USB_GSPCA_SQ905 is not set | ||
| 925 | # CONFIG_USB_GSPCA_SQ905C is not set | ||
| 926 | # CONFIG_USB_GSPCA_STK014 is not set | ||
| 927 | # CONFIG_USB_GSPCA_SUNPLUS is not set | ||
| 928 | # CONFIG_USB_GSPCA_T613 is not set | ||
| 929 | # CONFIG_USB_GSPCA_TV8532 is not set | ||
| 930 | # CONFIG_USB_GSPCA_VC032X is not set | ||
| 931 | # CONFIG_USB_GSPCA_ZC3XX is not set | ||
| 932 | # CONFIG_VIDEO_PVRUSB2 is not set | ||
| 933 | # CONFIG_VIDEO_HDPVR is not set | ||
| 934 | # CONFIG_VIDEO_EM28XX is not set | ||
| 935 | # CONFIG_VIDEO_CX231XX is not set | ||
| 936 | # CONFIG_VIDEO_USBVISION is not set | ||
| 937 | # CONFIG_USB_ET61X251 is not set | ||
| 938 | # CONFIG_USB_SN9C102 is not set | ||
| 939 | # CONFIG_USB_ZC0301 is not set | ||
| 940 | CONFIG_USB_PWC_INPUT_EVDEV=y | ||
| 941 | # CONFIG_USB_ZR364XX is not set | ||
| 942 | # CONFIG_USB_STKWEBCAM is not set | ||
| 943 | # CONFIG_USB_S2255 is not set | ||
| 944 | # CONFIG_RADIO_ADAPTERS is not set | ||
| 945 | # CONFIG_DAB is not set | ||
| 856 | 946 | ||
| 857 | # | 947 | # |
| 858 | # Graphics support | 948 | # Graphics support |
