diff --git a/debian/changelog b/debian/changelog index b5b2d3d76..443050fde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ linux-2.6 (2.6.26~rc3-1~experimental.1) UNRELEASED; urgency=low * Reenable USB_SERIAL_EDGEPORT, USB_SERIAL_EDGEPORT_TI. (closes: #480195) * Enable TCP_MD5SIG for BGP sessions. (closes: #443742) * Add recognised alsa cards to bug report. + * topconfig: Enable HYSDN, no longer broken on smp. [ Martin Michlmayr ] * [arm/orion5x] Update the config to reflect upstream renaming this diff --git a/debian/config/config b/debian/config/config index 19b2f9006..4559ac48c 100644 --- a/debian/config/config +++ b/debian/config/config @@ -469,6 +469,11 @@ CONFIG_GIGASET_M101=m # CONFIG_GIGASET_DEBUG is not set # CONFIG_GIGASET_UNDOCREQ is not set +## +## file: drivers/isdn/hysdn/Kconfig +## +CONFIG_HYSDN=m + ## ## file: drivers/leds/Kconfig ## diff --git a/debian/config/i386/config.686 b/debian/config/i386/config.686 index 468c442bb..ab731da74 100644 --- a/debian/config/i386/config.686 +++ b/debian/config/i386/config.686 @@ -47,11 +47,6 @@ CONFIG_X86_PPRO_FENCE=y # CONFIG_I2C_ELEKTOR is not set CONFIG_I2C_STUB=m -## -## file: drivers/isdn/hysdn/Kconfig -## -# CONFIG_HYSDN is not set - ## ## file: drivers/isdn/i4l/Kconfig ## diff --git a/debian/config/i386/config.686-bigmem b/debian/config/i386/config.686-bigmem index 019289683..e9846266b 100644 --- a/debian/config/i386/config.686-bigmem +++ b/debian/config/i386/config.686-bigmem @@ -50,11 +50,6 @@ CONFIG_X86_PPRO_FENCE=y # CONFIG_I2C_ELEKTOR is not set CONFIG_I2C_STUB=m -## -## file: drivers/isdn/hysdn/Kconfig -## -# CONFIG_HYSDN is not set - ## ## file: drivers/isdn/i4l/Kconfig ##