Set CONFIG_ATM=m so CONFIG_USB_ATM has an effect.
svn path=/dists/trunk/linux-2.6/; revision=7799
This commit is contained in:
parent
5ec84b8267
commit
7a4735d564
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue