From 7a4735d564c4301ad462801ce2314c6976f97051 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Tue, 14 Nov 2006 22:12:24 +0000
Subject: [PATCH] Set CONFIG_ATM=m so CONFIG_USB_ATM has an effect.

svn path=/dists/trunk/linux-2.6/; revision=7799
---
 debian/arch/arm/config.iop32x | 2 +-
 debian/arch/arm/config.ixp4xx | 2 +-
 debian/changelog              | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x
index 674b4f4a0..1bb9bb8f4 100644
--- a/debian/arch/arm/config.iop32x
+++ b/debian/arch/arm/config.iop32x
@@ -395,7 +395,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 # TIPC Configuration (EXPERIMENTAL)
 #
 # CONFIG_TIPC is not set
-# CONFIG_ATM is not set
+CONFIG_ATM=m
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_DECNET=m
diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx
index 701ee7c89..cb4ab9b25 100644
--- a/debian/arch/arm/config.ixp4xx
+++ b/debian/arch/arm/config.ixp4xx
@@ -424,7 +424,7 @@ CONFIG_TIPC_SLAVE_NODES=0
 CONFIG_TIPC_PORTS=8191
 CONFIG_TIPC_LOG=0
 # CONFIG_TIPC_DEBUG is not set
-# CONFIG_ATM is not set
+CONFIG_ATM=m
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_DECNET=m
diff --git a/debian/changelog b/debian/changelog
index 692e6e3ce..16f7f3dc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
 
   [ Martin Michlmayr ]
   - arm: Set CONFIG_BINFMT_MISC=m
+  - arm/ixp4xx: Set CONFIG_ATM=m so CONFIG_USB_ATM has an effect.
+  - arm/iop32x: Likewise.
 
   [ dann frazier ]
   * Backport various SCTP changesets from 2.6.19, recommended by Vlad Yasevich