summaryrefslogtreecommitdiff
path: root/v4l/scripts
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-22 10:22:44 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-22 10:22:44 -0300
commitb5ff2cd5cc913156858a0b15a186144f146c89d7 (patch)
treeedd0f29cf926feb480533f9880c60e9a833ac3fb /v4l/scripts
parent14eb37189ae76c7f329e1eb00c023198f6b3a33d (diff)
parent0fb7c2db703c043604353078f2b9fec995f60eeb (diff)
downloadmediapointer-dvb-s2-b5ff2cd5cc913156858a0b15a186144f146c89d7.tar.gz
mediapointer-dvb-s2-b5ff2cd5cc913156858a0b15a186144f146c89d7.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/scripts')
-rwxr-xr-xv4l/scripts/make_kconfig.pl3
1 files changed, 0 insertions, 3 deletions
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index ee649f574..20b94f0c1 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -583,9 +583,6 @@ disable_config('DVB_CINERGYT2_TUNING');
disable_config('DVB_FE_CUSTOMISE');
disable_config('VIDEO_HELPER_CHIPS_AUTO');
-# ACI needs some kernel includes that might not be there
-disable_config('SOUND_ACI_MIXER') if (! -e "$kernsrc/sound/oss/sound_config.h");
-
# Check dependencies
my %newconfig = checkdeps();