diff options
-rw-r--r-- | arch/powerpc/configs/85xx/mpc8544_ds_defconfig | 8 | ||||
-rw-r--r-- | arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 8 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 8 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc8641_hpcn_defconfig | 8 |
4 files changed, 20 insertions, 12 deletions
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig index 042a85ea7b72..a0583e5119f5 100644 --- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig | |||
@@ -997,10 +997,12 @@ CONFIG_SND=y | |||
997 | CONFIG_SND_TIMER=y | 997 | CONFIG_SND_TIMER=y |
998 | CONFIG_SND_PCM=y | 998 | CONFIG_SND_PCM=y |
999 | # CONFIG_SND_SEQUENCER is not set | 999 | # CONFIG_SND_SEQUENCER is not set |
1000 | # CONFIG_SND_MIXER_OSS is not set | 1000 | CONFIG_SND_OSSEMUL=y |
1001 | # CONFIG_SND_PCM_OSS is not set | 1001 | CONFIG_SND_MIXER_OSS=y |
1002 | CONFIG_SND_PCM_OSS=y | ||
1003 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
1002 | # CONFIG_SND_DYNAMIC_MINORS is not set | 1004 | # CONFIG_SND_DYNAMIC_MINORS is not set |
1003 | CONFIG_SND_SUPPORT_OLD_API=y | 1005 | # CONFIG_SND_SUPPORT_OLD_API is not set |
1004 | CONFIG_SND_VERBOSE_PROCFS=y | 1006 | CONFIG_SND_VERBOSE_PROCFS=y |
1005 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1007 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1006 | # CONFIG_SND_DEBUG is not set | 1008 | # CONFIG_SND_DEBUG is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig index 03627cfebcb4..164fd9606ee6 100644 --- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig | |||
@@ -997,10 +997,12 @@ CONFIG_SND=y | |||
997 | CONFIG_SND_TIMER=y | 997 | CONFIG_SND_TIMER=y |
998 | CONFIG_SND_PCM=y | 998 | CONFIG_SND_PCM=y |
999 | # CONFIG_SND_SEQUENCER is not set | 999 | # CONFIG_SND_SEQUENCER is not set |
1000 | # CONFIG_SND_MIXER_OSS is not set | 1000 | CONFIG_SND_OSSEMUL=y |
1001 | # CONFIG_SND_PCM_OSS is not set | 1001 | CONFIG_SND_MIXER_OSS=y |
1002 | CONFIG_SND_PCM_OSS=y | ||
1003 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
1002 | # CONFIG_SND_DYNAMIC_MINORS is not set | 1004 | # CONFIG_SND_DYNAMIC_MINORS is not set |
1003 | CONFIG_SND_SUPPORT_OLD_API=y | 1005 | # CONFIG_SND_SUPPORT_OLD_API is not set |
1004 | CONFIG_SND_VERBOSE_PROCFS=y | 1006 | CONFIG_SND_VERBOSE_PROCFS=y |
1005 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1007 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1006 | # CONFIG_SND_DEBUG is not set | 1008 | # CONFIG_SND_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 3efab71a603b..fa0170504b88 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
@@ -1005,10 +1005,12 @@ CONFIG_SND=y | |||
1005 | CONFIG_SND_TIMER=y | 1005 | CONFIG_SND_TIMER=y |
1006 | CONFIG_SND_PCM=y | 1006 | CONFIG_SND_PCM=y |
1007 | # CONFIG_SND_SEQUENCER is not set | 1007 | # CONFIG_SND_SEQUENCER is not set |
1008 | # CONFIG_SND_MIXER_OSS is not set | 1008 | CONFIG_SND_OSSEMUL=y |
1009 | # CONFIG_SND_PCM_OSS is not set | 1009 | CONFIG_SND_MIXER_OSS=y |
1010 | CONFIG_SND_PCM_OSS=y | ||
1011 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
1010 | # CONFIG_SND_DYNAMIC_MINORS is not set | 1012 | # CONFIG_SND_DYNAMIC_MINORS is not set |
1011 | CONFIG_SND_SUPPORT_OLD_API=y | 1013 | # CONFIG_SND_SUPPORT_OLD_API is not set |
1012 | CONFIG_SND_VERBOSE_PROCFS=y | 1014 | CONFIG_SND_VERBOSE_PROCFS=y |
1013 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1015 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1014 | # CONFIG_SND_DEBUG is not set | 1016 | # CONFIG_SND_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index 4a8171507391..867b8c0215f3 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig | |||
@@ -991,10 +991,12 @@ CONFIG_SND=y | |||
991 | CONFIG_SND_TIMER=y | 991 | CONFIG_SND_TIMER=y |
992 | CONFIG_SND_PCM=y | 992 | CONFIG_SND_PCM=y |
993 | # CONFIG_SND_SEQUENCER is not set | 993 | # CONFIG_SND_SEQUENCER is not set |
994 | # CONFIG_SND_MIXER_OSS is not set | 994 | CONFIG_SND_OSSEMUL=y |
995 | # CONFIG_SND_PCM_OSS is not set | 995 | CONFIG_SND_MIXER_OSS=y |
996 | CONFIG_SND_PCM_OSS=y | ||
997 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
996 | # CONFIG_SND_DYNAMIC_MINORS is not set | 998 | # CONFIG_SND_DYNAMIC_MINORS is not set |
997 | CONFIG_SND_SUPPORT_OLD_API=y | 999 | # CONFIG_SND_SUPPORT_OLD_API is not set |
998 | CONFIG_SND_VERBOSE_PROCFS=y | 1000 | CONFIG_SND_VERBOSE_PROCFS=y |
999 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1001 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1000 | # CONFIG_SND_DEBUG is not set | 1002 | # CONFIG_SND_DEBUG is not set |