[kernel] r7716 - in dists/trunk/linux-2.6/debian: . arch/arm

[Martin Michlmayr]

Author: tbm
Date: Wed Nov  8 10:51:39 2006
New Revision: 7716

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/changelog
Log:
arm: Enable CONFIG_USB_ATM.


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	Wed Nov  8 10:51:39 2006
@@ -927,14 +927,14 @@
 # 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 @@
 #
 # 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

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Wed Nov  8 10:51:39 2006
@@ -1643,6 +1643,11 @@
 #
 # 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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Nov  8 10:51:39 2006
@@ -28,6 +28,11 @@
     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 <maks at sternwelten.at>  Wed,  8 Nov 2006 00:26:39 +0100
 
 linux-2.6 (2.6.18-4) unstable; urgency=low