diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 6c81199e5..1c77b3daa 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -74,7 +74,6 @@ CONFIG_SUN_PARTITION=y
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
 CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
 CONFIG_PATA_CYPRESS=m
 CONFIG_PATA_EFAR=m
 CONFIG_PATA_HPT366=m
diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx
index 0e8bc649b..93fc873cc 100644
--- a/debian/config/armel/config.ixp4xx
+++ b/debian/config/armel/config.ixp4xx
@@ -86,7 +86,6 @@ CONFIG_SATA_VIA=m
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
 # CONFIG_PATA_HPT366 is not set
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index cd2455838..b12814566 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -98,7 +98,6 @@ CONFIG_SATA_MV=m
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
 # CONFIG_PATA_HPT366 is not set
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index 3bca592f7..84e4b91c5 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -102,7 +102,6 @@ CONFIG_SATA_MV=m
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
 # CONFIG_PATA_HPT366 is not set
diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile
index f4fbc942c..855451f5b 100644
--- a/debian/config/armel/config.versatile
+++ b/debian/config/armel/config.versatile
@@ -67,7 +67,6 @@ CONFIG_SATA_VIA=m
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
 # CONFIG_PATA_HPT366 is not set
diff --git a/debian/config/config b/debian/config/config
index 330d51508..375041867 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5858,7 +5858,6 @@ CONFIG_SND_ALS300=m
 CONFIG_SND_ASIHPI=m
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index b8896e1e1..e65dfcaa5 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -69,7 +69,6 @@ CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
 CONFIG_PATA_CMD64X=m
 CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
 CONFIG_PATA_EFAR=m
 CONFIG_PATA_HPT366=m
 CONFIG_PATA_HPT37X=m
@@ -267,7 +266,6 @@ CONFIG_BLK_DEV_IDETAPE=m
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_HPT366 is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
diff --git a/debian/config/kernelarch-mips/config.sb1-bcm91250a b/debian/config/kernelarch-mips/config.sb1-bcm91250a
index e3e697df6..424d1167b 100644
--- a/debian/config/kernelarch-mips/config.sb1-bcm91250a
+++ b/debian/config/kernelarch-mips/config.sb1-bcm91250a
@@ -38,7 +38,6 @@ CONFIG_SGI_PARTITION=y
 CONFIG_ATA=y
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
-CONFIG_PATA_CS5530=m
 CONFIG_PATA_CYPRESS=y
 CONFIG_PATA_EFAR=m
 CONFIG_PATA_NS87415=m
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index 0876792a0..b6563d09c 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -30,7 +30,6 @@ CONFIG_CRYPTO_DES_SPARC64=m
 ##
 CONFIG_PATA_ALI=m
 CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NS87415=m
 CONFIG_PATA_PDC2027X=m
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index eac42a10b..570d75b9e 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -555,4 +555,5 @@ CONFIG_SND_MSND_CLASSIC=m
 ## file: sound/pci/Kconfig
 ##
 CONFIG_SND_SIS7019=m
+CONFIG_SND_CS5530=m