diff --git a/debian/changelog b/debian/changelog index 1fb47f955..223f4df03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,7 @@ linux-2.6 (2.6.30-1~experimental.1) UNRELEASED; urgency=low [ Bastian Blank ] * [i386] Disable PentiumPro errata workaround. * [i386] Enable support for big SMP systems. + * Disable OSS. [ dann frazier ] * Enable bnx2x, using firmware-split patches from net-next and mirroring diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 985aeb0f5..271407b50 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1256,11 +1256,6 @@ CONFIG_WAN_ROUTER=m ## CONFIG_X25=m -## -## file: sound/Kconfig -## -CONFIG_SOUND_PRIME=m - ## ## file: sound/core/Kconfig ## diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 1d3615ac0..9cdba775a 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1338,11 +1338,6 @@ CONFIG_WAN_ROUTER=m ## CONFIG_X25=m -## -## file: sound/Kconfig -## -CONFIG_SOUND_PRIME=m - ## ## file: sound/core/Kconfig ## diff --git a/debian/config/i386/config b/debian/config/i386/config index e87ab4867..1356ecee0 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1520,11 +1520,6 @@ CONFIG_WAN_ROUTER=m ## CONFIG_X25=m -## -## file: sound/Kconfig -## -CONFIG_SOUND_PRIME=m - ## ## file: sound/core/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index ce349cc96..6be9073a3 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -881,7 +881,6 @@ CONFIG_IRNET=m ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SOUND_PRIME=m ## ## file: sound/core/Kconfig