diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x index c818e6050..0af57aeff 100644 --- a/debian/arch/arm/config.iop32x +++ b/debian/arch/arm/config.iop32x @@ -927,14 +927,14 @@ CONFIG_NET_WIRELESS=y # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set +CONFIG_PPP_MULTILINK=y CONFIG_PPP_FILTER=y CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m -# CONFIG_PPP_MPPE is not set -# CONFIG_PPPOE is not set +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m CONFIG_SLIP=m CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y @@ -1688,6 +1688,11 @@ CONFIG_USB_LD=m # # USB DSL modem support # +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m # # USB Gadget Support diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 3b5997408..147572819 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1643,6 +1643,11 @@ CONFIG_USB_LD=m # # USB DSL modem support # +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m # # USB Gadget Support diff --git a/debian/changelog b/debian/changelog index 02641f578..01ebb0bf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,11 @@ linux-2.6 (2.6.18-5) UNRELEASED; urgency=low will still compile without having to cripple gcc-4.1's checking of whether the correct instruction set is used. Closes: #397139. + [ Martin Michlmayr ] + * arm/ixp4xx: Enable CONFIG_USB_ATM. + * arm/iop32x: Enable CONFIG_PPPOE. + * arm/iop32x: Enable CONFIG_USB_ATM. + -- maximilian attems Wed, 8 Nov 2006 00:26:39 +0100 linux-2.6 (2.6.18-4) unstable; urgency=low