Skip to content

Commit 310ebe9

Browse files
author
Fox Snowpatch
committed
From patchwork series 500919
https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=500919
1 parent 182544a commit 310ebe9

56 files changed

Lines changed: 2 additions & 37237 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/.renames.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,14 +836,12 @@ networking/e100 networking/device_drivers/ethernet/intel/e100
836836
networking/e1000 networking/device_drivers/ethernet/intel/e1000
837837
networking/e1000e networking/device_drivers/ethernet/intel/e1000e
838838
networking/fm10k networking/device_drivers/ethernet/intel/fm10k
839-
networking/fore200e networking/device_drivers/atm/fore200e
840839
networking/hinic networking/device_drivers/ethernet/huawei/hinic
841840
networking/i40e networking/device_drivers/ethernet/intel/i40e
842841
networking/iavf networking/device_drivers/ethernet/intel/iavf
843842
networking/ice networking/device_drivers/ethernet/intel/ice
844843
networking/igb networking/device_drivers/ethernet/intel/igb
845844
networking/igbvf networking/device_drivers/ethernet/intel/igbvf
846-
networking/iphase networking/device_drivers/atm/iphase
847845
networking/ixgbe networking/device_drivers/ethernet/intel/ixgbe
848846
networking/ixgbevf networking/device_drivers/ethernet/intel/ixgbevf
849847
networking/netdev-FAQ process/maintainer-netdev

‎Documentation/networking/device_drivers/atm/fore200e.rst‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎Documentation/networking/device_drivers/atm/index.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ Contents:
99
:maxdepth: 2
1010

1111
cxacru
12-
fore200e
13-
iphase

‎Documentation/networking/device_drivers/atm/iphase.rst‎

Lines changed: 0 additions & 193 deletions
This file was deleted.

‎MAINTAINERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4160,11 +4160,12 @@ L: linux-atm-general@lists.sourceforge.net (moderated for non-subscribers)
41604160
L: netdev@vger.kernel.org
41614161
S: Maintained
41624162
W: http://linux-atm.sourceforge.net
4163-
F: drivers/atm/
4163+
F: drivers/usb/atm/
41644164
F: include/linux/atm*
41654165
F: include/linux/sonet.h
41664166
F: include/uapi/linux/atm*
41674167
F: include/uapi/linux/sonet.h
4168+
F: net/atm/
41684169

41694170
ATMEL MACB ETHERNET DRIVER
41704171
M: Nicolas Ferre <nicolas.ferre@microchip.com>

‎arch/arm/configs/ixp4xx_defconfig‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ CONFIG_IP_NF_MANGLE=m
5252
CONFIG_IP_NF_ARPTABLES=m
5353
CONFIG_IP_NF_ARPFILTER=m
5454
CONFIG_ATM=y
55-
CONFIG_ATM_CLIP=y
56-
CONFIG_ATM_LANE=m
57-
CONFIG_ATM_MPOA=m
58-
CONFIG_ATM_BR2684=m
5955
CONFIG_BRIDGE=m
6056
CONFIG_VLAN_8021Q=m
6157
CONFIG_ATALK=m
@@ -108,7 +104,6 @@ CONFIG_ATA=y
108104
CONFIG_PATA_IXP4XX_CF=y
109105
CONFIG_NETDEVICES=y
110106
CONFIG_DUMMY=y
111-
CONFIG_ATM_TCP=m
112107
CONFIG_IXP4XX_ETH=y
113108
CONFIG_WAN=y
114109
CONFIG_HDLC=y

‎arch/mips/configs/gpr_defconfig‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ CONFIG_BRIDGE_EBT_LOG=m
8787
CONFIG_IP_SCTP=m
8888
CONFIG_TIPC=m
8989
CONFIG_ATM=y
90-
CONFIG_ATM_CLIP=y
91-
CONFIG_ATM_LANE=m
92-
CONFIG_ATM_MPOA=m
93-
CONFIG_ATM_BR2684=m
9490
CONFIG_BRIDGE=m
9591
CONFIG_VLAN_8021Q=m
9692
CONFIG_LLC2=m
@@ -167,15 +163,6 @@ CONFIG_SCSI_SAS_LIBSAS=m
167163
CONFIG_NETDEVICES=y
168164
CONFIG_NET_FC=y
169165
CONFIG_NETCONSOLE=m
170-
CONFIG_ATM_TCP=m
171-
CONFIG_ATM_LANAI=m
172-
CONFIG_ATM_ENI=m
173-
CONFIG_ATM_NICSTAR=m
174-
CONFIG_ATM_IDT77252=m
175-
CONFIG_ATM_IA=m
176-
CONFIG_ATM_FORE200E=m
177-
CONFIG_ATM_HE=m
178-
CONFIG_ATM_HE_USE_SUNI=y
179166
CONFIG_MIPS_AU1X00_ENET=y
180167
CONFIG_CICADA_PHY=m
181168
CONFIG_DAVICOM_PHY=m

‎arch/mips/configs/mtx1_defconfig‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@ CONFIG_BRIDGE_EBT_LOG=m
133133
CONFIG_IP_SCTP=m
134134
CONFIG_TIPC=m
135135
CONFIG_ATM=y
136-
CONFIG_ATM_CLIP=y
137-
CONFIG_ATM_LANE=m
138-
CONFIG_ATM_MPOA=m
139-
CONFIG_ATM_BR2684=m
140136
CONFIG_BRIDGE=m
141137
CONFIG_VLAN_8021Q=m
142138
CONFIG_LLC2=m
@@ -243,15 +239,6 @@ CONFIG_ARCNET_RIM_I=m
243239
CONFIG_ARCNET_COM20020=m
244240
CONFIG_ARCNET_COM20020_PCI=m
245241
CONFIG_ARCNET_COM20020_CS=m
246-
CONFIG_ATM_TCP=m
247-
CONFIG_ATM_LANAI=m
248-
CONFIG_ATM_ENI=m
249-
CONFIG_ATM_NICSTAR=m
250-
CONFIG_ATM_IDT77252=m
251-
CONFIG_ATM_IA=m
252-
CONFIG_ATM_FORE200E=m
253-
CONFIG_ATM_HE=m
254-
CONFIG_ATM_HE_USE_SUNI=y
255242
CONFIG_PCMCIA_3C574=m
256243
CONFIG_PCMCIA_3C589=m
257244
CONFIG_VORTEX=m

‎arch/powerpc/configs/ppc6xx_defconfig‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,6 @@ CONFIG_BRIDGE_EBT_LOG=m
227227
CONFIG_BRIDGE_EBT_NFLOG=m
228228
CONFIG_TIPC=m
229229
CONFIG_ATM=m
230-
CONFIG_ATM_CLIP=m
231-
CONFIG_ATM_LANE=m
232-
CONFIG_ATM_BR2684=m
233230
CONFIG_BRIDGE=m
234231
CONFIG_VLAN_8021Q=m
235232
CONFIG_ATALK=m
@@ -398,12 +395,6 @@ CONFIG_NETCONSOLE=m
398395
CONFIG_TUN=m
399396
CONFIG_VETH=m
400397
CONFIG_VIRTIO_NET=m
401-
CONFIG_ATM_TCP=m
402-
CONFIG_ATM_LANAI=m
403-
CONFIG_ATM_ENI=m
404-
CONFIG_ATM_NICSTAR=m
405-
CONFIG_ATM_IDT77252=m
406-
CONFIG_ATM_HE=m
407398
CONFIG_EL3=m
408399
CONFIG_PCMCIA_3C574=m
409400
CONFIG_PCMCIA_3C589=m

‎drivers/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ obj-$(CONFIG_SPMI) += spmi/
9090
obj-$(CONFIG_HSI) += hsi/
9191
obj-$(CONFIG_SLIMBUS) += slimbus/
9292
obj-y += net/
93-
obj-$(CONFIG_ATM) += atm/
9493
obj-$(CONFIG_FUSION) += message/
9594
obj-y += firewire/
9695
obj-$(CONFIG_UIO) += uio/

0 commit comments

Comments
 (0)