Home Home > GIT Browse

Tools

Branches

openSUSE

Upstream

SLE

summaryrefslogtreecommitdiff
authorTakashi Iwai <tiwai@suse.de>2009-07-29 14:01:26 (GMT)
committer Takashi Iwai <tiwai@suse.de>2009-07-29 14:01:26 (GMT)
commitddfe58aede98cf3f017c0e8eefbb5189e835d82c (patch) (side-by-side diff)
treed454a934aebfb076f0da374084bfa6aa40a57d0a
parentf21b9fb117027ab91eaec71b5382a2e5fa5cc103 (diff)
- Update config files: revert to CONFIG_SND=m and enabled againrpm-2.6.31-1
CONFIG_SND_DEBUG=y
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--config/i386/default4
-rw-r--r--config/i386/desktop16
-rw-r--r--config/i386/pae16
-rw-r--r--config/i386/trace16
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/i386/xen2
-rw-r--r--config/x86_64/default16
-rw-r--r--config/x86_64/desktop16
-rw-r--r--config/x86_64/trace16
-rw-r--r--config/x86_64/vanilla4
-rw-r--r--config/x86_64/xen2
-rw-r--r--kernel-source.changes6
12 files changed, 68 insertions, 48 deletions
diff --git a/config/i386/default b/config/i386/default
index 5906790..0a601f4 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -3583,7 +3583,9 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/config/i386/desktop b/config/i386/desktop
index 76132e9..690a644 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -3427,17 +3427,17 @@ CONFIG_FONT_8x16=y
CONFIG_BOOTSPLASH=y
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
@@ -3446,7 +3446,9 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/config/i386/pae b/config/i386/pae
index 98dfda8..7dafdd9 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -3443,17 +3443,17 @@ CONFIG_FONT_8x16=y
CONFIG_BOOTSPLASH=y
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
@@ -3462,7 +3462,9 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/config/i386/trace b/config/i386/trace
index b8a20a6..bed03ab 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -3443,17 +3443,17 @@ CONFIG_FONT_8x16=y
CONFIG_BOOTSPLASH=y
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
@@ -3462,7 +3462,9 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 7646637..0250fe6 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -3568,7 +3568,7 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/config/i386/xen b/config/i386/xen
index 00315ef..a757737 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -3256,7 +3256,7 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_MPU401_UART=m
CONFIG_SND_OPL3_LIB=m
diff --git a/config/x86_64/default b/config/x86_64/default
index d53982d..56bc358 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -3371,17 +3371,17 @@ CONFIG_FONT_8x16=y
CONFIG_BOOTSPLASH=y
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
@@ -3390,7 +3390,9 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index e4dcd2a..3b1677c 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -3355,17 +3355,17 @@ CONFIG_FONT_8x16=y
CONFIG_BOOTSPLASH=y
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
@@ -3374,7 +3374,9 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/config/x86_64/trace b/config/x86_64/trace
index 55c2a76..abe6506 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -3371,17 +3371,17 @@ CONFIG_FONT_8x16=y
CONFIG_BOOTSPLASH=y
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
@@ -3390,7 +3390,9 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
+# CONFIG_SND_DEBUG_VERBOSE is not set
+CONFIG_SND_PCM_XRUN_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 0e08a9c..3f72ba7 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -3354,7 +3354,7 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE=y
-CONFIG_SND=y
+CONFIG_SND=m
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
CONFIG_SND_HWDEP=m
@@ -3373,7 +3373,7 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/config/x86_64/xen b/config/x86_64/xen
index f0965dc..da0633c 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -3203,7 +3203,7 @@ CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VERBOSE_PRINTK=y
-# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DEBUG=y
CONFIG_SND_VMASTER=y
CONFIG_SND_MPU401_UART=m
CONFIG_SND_OPL3_LIB=m
diff --git a/kernel-source.changes b/kernel-source.changes
index f138364..cfb3f9c 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
+
+- Update config files: revert to CONFIG_SND=m and enabled again
+ CONFIG_SND_DEBUG=y
+
+-------------------------------------------------------------------
Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.