diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 72 | ||||
| -rw-r--r-- | drivers/net/Makefile | 3 | ||||
| -rw-r--r-- | drivers/net/fddi/Kconfig | 77 | ||||
| -rw-r--r-- | drivers/net/fddi/Makefile | 6 | ||||
| -rw-r--r-- | drivers/net/fddi/defxx.c (renamed from drivers/net/defxx.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/defxx.h (renamed from drivers/net/defxx.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/Makefile (renamed from drivers/net/skfp/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/cfm.c (renamed from drivers/net/skfp/cfm.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/drvfbi.c (renamed from drivers/net/skfp/drvfbi.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/ecm.c (renamed from drivers/net/skfp/ecm.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/ess.c (renamed from drivers/net/skfp/ess.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/fplustm.c (renamed from drivers/net/skfp/fplustm.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/cmtdef.h (renamed from drivers/net/skfp/h/cmtdef.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/fddi.h (renamed from drivers/net/skfp/h/fddi.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/fddimib.h (renamed from drivers/net/skfp/h/fddimib.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/fplustm.h (renamed from drivers/net/skfp/h/fplustm.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/hwmtm.h (renamed from drivers/net/skfp/h/hwmtm.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/mbuf.h (renamed from drivers/net/skfp/h/mbuf.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/osdef1st.h (renamed from drivers/net/skfp/h/osdef1st.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/sba.h (renamed from drivers/net/skfp/h/sba.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/sba_def.h (renamed from drivers/net/skfp/h/sba_def.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/skfbi.h (renamed from drivers/net/skfp/h/skfbi.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/skfbiinc.h (renamed from drivers/net/skfp/h/skfbiinc.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/smc.h (renamed from drivers/net/skfp/h/smc.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/smt.h (renamed from drivers/net/skfp/h/smt.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/smt_p.h (renamed from drivers/net/skfp/h/smt_p.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/smtstate.h (renamed from drivers/net/skfp/h/smtstate.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/supern_2.h (renamed from drivers/net/skfp/h/supern_2.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/targethw.h (renamed from drivers/net/skfp/h/targethw.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/targetos.h (renamed from drivers/net/skfp/h/targetos.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/types.h (renamed from drivers/net/skfp/h/types.h) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/hwmtm.c (renamed from drivers/net/skfp/hwmtm.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/hwt.c (renamed from drivers/net/skfp/hwt.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/pcmplc.c (renamed from drivers/net/skfp/pcmplc.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/pmf.c (renamed from drivers/net/skfp/pmf.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/queue.c (renamed from drivers/net/skfp/queue.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/rmt.c (renamed from drivers/net/skfp/rmt.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/skfddi.c (renamed from drivers/net/skfp/skfddi.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/smt.c (renamed from drivers/net/skfp/smt.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/smtdef.c (renamed from drivers/net/skfp/smtdef.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/smtinit.c (renamed from drivers/net/skfp/smtinit.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/smttimer.c (renamed from drivers/net/skfp/smttimer.c) | 0 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/srf.c (renamed from drivers/net/skfp/srf.c) | 0 |
44 files changed, 87 insertions, 73 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d32e1ca5ba732..2777088fa2bfd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2113,7 +2113,7 @@ F: net/decnet/ DEFXX FDDI NETWORK DRIVER M: "Maciej W. Rozycki" <macro@linux-mips.org> S: Maintained -F: drivers/net/defxx.* +F: drivers/net/fddi/defxx.* DELL LAPTOP DRIVER M: Matthew Garrett <mjg59@srcf.ucam.org> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ef6b6bee11da9..7bdc22b598561 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -195,6 +195,8 @@ config SUNGEM_PHY source "drivers/net/ethernet/Kconfig" +source "drivers/net/fddi/Kconfig" + source "drivers/net/tokenring/Kconfig" source "drivers/net/wireless/Kconfig" @@ -268,76 +270,6 @@ config RIONET_RX_SIZE depends on RIONET default "128" -config FDDI - tristate "FDDI driver support" - depends on (PCI || EISA || TC) - help - Fiber Distributed Data Interface is a high speed local area network - design; essentially a replacement for high speed Ethernet. FDDI can - run over copper or fiber. If you are connected to such a network and - want a driver for the FDDI card in your computer, say Y here (and - then also Y to the driver for your FDDI card, below). Most people - will say N. - -config DEFXX - tristate "Digital DEFTA/DEFEA/DEFPA adapter support" - depends on FDDI && (PCI || EISA || TC) - ---help--- - This is support for the DIGITAL series of TURBOchannel (DEFTA), - EISA (DEFEA) and PCI (DEFPA) controllers which can connect you - to a local FDDI network. - - To compile this driver as a module, choose M here: the module - will be called defxx. If unsure, say N. - -config DEFXX_MMIO - bool - prompt "Use MMIO instead of PIO" if PCI || EISA - depends on DEFXX - default n if PCI || EISA - default y - ---help--- - This instructs the driver to use EISA or PCI memory-mapped I/O - (MMIO) as appropriate instead of programmed I/O ports (PIO). - Enabling this gives an improvement in processing time in parts - of the driver, but it may cause problems with EISA (DEFEA) - adapters. TURBOchannel does not have the concept of I/O ports, - so MMIO is always used for these (DEFTA) adapters. - - If unsure, say N. - -config SKFP - tristate "SysKonnect FDDI PCI support" - depends on FDDI && PCI - select BITREVERSE - ---help--- - Say Y here if you have a SysKonnect FDDI PCI adapter. - The following adapters are supported by this driver: - - SK-5521 (SK-NET FDDI-UP) - - SK-5522 (SK-NET FDDI-UP DAS) - - SK-5541 (SK-NET FDDI-FP) - - SK-5543 (SK-NET FDDI-LP) - - SK-5544 (SK-NET FDDI-LP DAS) - - SK-5821 (SK-NET FDDI-UP64) - - SK-5822 (SK-NET FDDI-UP64 DAS) - - SK-5841 (SK-NET FDDI-FP64) - - SK-5843 (SK-NET FDDI-LP64) - - SK-5844 (SK-NET FDDI-LP64 DAS) - - Netelligent 100 FDDI DAS Fibre SC - - Netelligent 100 FDDI SAS Fibre SC - - Netelligent 100 FDDI DAS UTP - - Netelligent 100 FDDI SAS UTP - - Netelligent 100 FDDI SAS Fibre MIC - - Read <file:Documentation/networking/skfp.txt> for information about - the driver. - - Questions concerning this driver can be addressed to: - <linux@syskonnect.de> - - To compile this driver as a module, choose M here: the module - will be called skfp. This is recommended. - config HIPPI bool "HIPPI driver support (EXPERIMENTAL)" depends on EXPERIMENTAL && INET && PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index c33009b49608c..3087b27c7841d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -14,7 +14,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/ # obj-$(CONFIG_PLIP) += plip.o obj-$(CONFIG_ROADRUNNER) += rrunner.o -obj-$(CONFIG_SKFP) += skfp/ obj-$(CONFIG_RIONET) += rionet.o # @@ -42,13 +41,13 @@ obj-$(CONFIG_DUMMY) += dummy.o obj-$(CONFIG_IFB) += ifb.o obj-$(CONFIG_MACVLAN) += macvlan.o obj-$(CONFIG_MACVTAP) += macvtap.o -obj-$(CONFIG_DEFXX) += defxx.o obj-$(CONFIG_EQUALIZER) += eql.o obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_ETHERNET) += ethernet/ +obj-$(CONFIG_FDDI) += fddi/ obj-$(CONFIG_TR) += tokenring/ obj-$(CONFIG_WAN) += wan/ obj-$(CONFIG_ARCNET) += arcnet/ diff --git a/drivers/net/fddi/Kconfig b/drivers/net/fddi/Kconfig new file mode 100644 index 0000000000000..3a424c864f4db --- /dev/null +++ b/drivers/net/fddi/Kconfig @@ -0,0 +1,77 @@ +# +# FDDI network device configuration +# + +config FDDI + tristate "FDDI driver support" + depends on PCI || EISA || TC + ---help--- + Fiber Distributed Data Interface is a high speed local area network + design; essentially a replacement for high speed Ethernet. FDDI can + run over copper or fiber. If you are connected to such a network and + want a driver for the FDDI card in your computer, say Y here (and + then also Y to the driver for your FDDI card, below). Most people + will say N. + +if FDDI + +config DEFXX + tristate "Digital DEFTA/DEFEA/DEFPA adapter support" + depends on FDDI && (PCI || EISA || TC) + ---help--- + This is support for the DIGITAL series of TURBOchannel (DEFTA), + EISA (DEFEA) and PCI (DEFPA) controllers which can connect you + to a local FDDI network. + + To compile this driver as a module, choose M here: the module + will be called defxx. If unsure, say N. + +config DEFXX_MMIO + bool + prompt "Use MMIO instead of PIO" if PCI || EISA + depends on DEFXX + default n if PCI || EISA + default y + ---help--- + This instructs the driver to use EISA or PCI memory-mapped I/O + (MMIO) as appropriate instead of programmed I/O ports (PIO). + Enabling this gives an improvement in processing time in parts + of the driver, but it may cause problems with EISA (DEFEA) + adapters. TURBOchannel does not have the concept of I/O ports, + so MMIO is always used for these (DEFTA) adapters. + + If unsure, say N. + +config SKFP + tristate "SysKonnect FDDI PCI support" + depends on FDDI && PCI + select BITREVERSE + ---help--- + Say Y here if you have a SysKonnect FDDI PCI adapter. + The following adapters are supported by this driver: + - SK-5521 (SK-NET FDDI-UP) + - SK-5522 (SK-NET FDDI-UP DAS) + - SK-5541 (SK-NET FDDI-FP) + - SK-5543 (SK-NET FDDI-LP) + - SK-5544 (SK-NET FDDI-LP DAS) + - SK-5821 (SK-NET FDDI-UP64) + - SK-5822 (SK-NET FDDI-UP64 DAS) + - SK-5841 (SK-NET FDDI-FP64) + - SK-5843 (SK-NET FDDI-LP64) + - SK-5844 (SK-NET FDDI-LP64 DAS) + - Netelligent 100 FDDI DAS Fibre SC + - Netelligent 100 FDDI SAS Fibre SC + - Netelligent 100 FDDI DAS UTP + - Netelligent 100 FDDI SAS UTP + - Netelligent 100 FDDI SAS Fibre MIC + + Read <file:Documentation/networking/skfp.txt> for information about + the driver. + + Questions concerning this driver can be addressed to: + <linux@syskonnect.de> + + To compile this driver as a module, choose M here: the module + will be called skfp. This is recommended. + +endif # FDDI diff --git a/drivers/net/fddi/Makefile b/drivers/net/fddi/Makefile new file mode 100644 index 0000000000000..36da19c9a8aa0 --- /dev/null +++ b/drivers/net/fddi/Makefile @@ -0,0 +1,6 @@ +# +# Makefile for the Linux FDDI network device drivers. +# + +obj-$(CONFIG_DEFXX) += defxx.o +obj-$(CONFIG_SKFP) += skfp/ diff --git a/drivers/net/defxx.c b/drivers/net/fddi/defxx.c index 4ad80f7710995..4ad80f7710995 100644 --- a/drivers/net/defxx.c +++ b/drivers/net/fddi/defxx.c diff --git a/drivers/net/defxx.h b/drivers/net/fddi/defxx.h index 19a6f64df1984..19a6f64df1984 100644 --- a/drivers/net/defxx.h +++ b/drivers/net/fddi/defxx.h diff --git a/drivers/net/skfp/Makefile b/drivers/net/fddi/skfp/Makefile index b0be0234abf6a..b0be0234abf6a 100644 --- a/drivers/net/skfp/Makefile +++ b/drivers/net/fddi/skfp/Makefile diff --git a/drivers/net/skfp/cfm.c b/drivers/net/fddi/skfp/cfm.c index e395ace3120b1..e395ace3120b1 100644 --- a/drivers/net/skfp/cfm.c +++ b/drivers/net/fddi/skfp/cfm.c diff --git a/drivers/net/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c index 07da97c303d68..07da97c303d68 100644 --- a/drivers/net/skfp/drvfbi.c +++ b/drivers/net/fddi/skfp/drvfbi.c diff --git a/drivers/net/skfp/ecm.c b/drivers/net/fddi/skfp/ecm.c index 47d922cb3c08c..47d922cb3c08c 100644 --- a/drivers/net/skfp/ecm.c +++ b/drivers/net/fddi/skfp/ecm.c diff --git a/drivers/net/skfp/ess.c b/drivers/net/fddi/skfp/ess.c index 2fc5987b41dc2..2fc5987b41dc2 100644 --- a/drivers/net/skfp/ess.c +++ b/drivers/net/fddi/skfp/ess.c diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/fddi/skfp/fplustm.c index a20ed1a98099f..a20ed1a98099f 100644 --- a/drivers/net/skfp/fplustm.c +++ b/drivers/net/fddi/skfp/fplustm.c diff --git a/drivers/net/skfp/h/cmtdef.h b/drivers/net/fddi/skfp/h/cmtdef.h index 5a6c6122ccb07..5a6c6122ccb07 100644 --- a/drivers/net/skfp/h/cmtdef.h +++ b/drivers/net/fddi/skfp/h/cmtdef.h diff --git a/drivers/net/skfp/h/fddi.h b/drivers/net/fddi/skfp/h/fddi.h index c9a28a8a383b6..c9a28a8a383b6 100644 --- a/drivers/net/skfp/h/fddi.h +++ b/drivers/net/fddi/skfp/h/fddi.h diff --git a/drivers/net/skfp/h/fddimib.h b/drivers/net/fddi/skfp/h/fddimib.h index d1acdc7739503..d1acdc7739503 100644 --- a/drivers/net/skfp/h/fddimib.h +++ b/drivers/net/fddi/skfp/h/fddimib.h diff --git a/drivers/net/skfp/h/fplustm.h b/drivers/net/fddi/skfp/h/fplustm.h index d43191ed938b4..d43191ed938b4 100644 --- a/drivers/net/skfp/h/fplustm.h +++ b/drivers/net/fddi/skfp/h/fplustm.h diff --git a/drivers/net/skfp/h/hwmtm.h b/drivers/net/fddi/skfp/h/hwmtm.h index e1a7e5f683dc6..e1a7e5f683dc6 100644 --- a/drivers/net/skfp/h/hwmtm.h +++ b/drivers/net/fddi/skfp/h/hwmtm.h diff --git a/drivers/net/skfp/h/mbuf.h b/drivers/net/fddi/skfp/h/mbuf.h index f2aadcda9e7fa..f2aadcda9e7fa 100644 --- a/drivers/net/skfp/h/mbuf.h +++ b/drivers/net/fddi/skfp/h/mbuf.h diff --git a/drivers/net/skfp/h/osdef1st.h b/drivers/net/fddi/skfp/h/osdef1st.h index 763ca18cbea87..763ca18cbea87 100644 --- a/drivers/net/skfp/h/osdef1st.h +++ b/drivers/net/fddi/skfp/h/osdef1st.h diff --git a/drivers/net/skfp/h/sba.h b/drivers/net/fddi/skfp/h/sba.h index 638cf0283bc40..638cf0283bc40 100644 --- a/drivers/net/skfp/h/sba.h +++ b/drivers/net/fddi/skfp/h/sba.h diff --git a/drivers/net/skfp/h/sba_def.h b/drivers/net/fddi/skfp/h/sba_def.h index 0459a095d0cd7..0459a095d0cd7 100644 --- a/drivers/net/skfp/h/sba_def.h +++ b/drivers/net/fddi/skfp/h/sba_def.h diff --git a/drivers/net/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h index c1ba26c06d731..c1ba26c06d731 100644 --- a/drivers/net/skfp/h/skfbi.h +++ b/drivers/net/fddi/skfp/h/skfbi.h diff --git a/drivers/net/skfp/h/skfbiinc.h b/drivers/net/fddi/skfp/h/skfbiinc.h index ac2d7192f1ca2..ac2d7192f1ca2 100644 --- a/drivers/net/skfp/h/skfbiinc.h +++ b/drivers/net/fddi/skfp/h/skfbiinc.h diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/fddi/skfp/h/smc.h index c774a95902f5e..c774a95902f5e 100644 --- a/drivers/net/skfp/h/smc.h +++ b/drivers/net/fddi/skfp/h/smc.h diff --git a/drivers/net/skfp/h/smt.h b/drivers/net/fddi/skfp/h/smt.h index 2030f9cbb24b7..2030f9cbb24b7 100644 --- a/drivers/net/skfp/h/smt.h +++ b/drivers/net/fddi/skfp/h/smt.h diff --git a/drivers/net/skfp/h/smt_p.h b/drivers/net/fddi/skfp/h/smt_p.h index 99f9be9552bbb..99f9be9552bbb 100644 --- a/drivers/net/skfp/h/smt_p.h +++ b/drivers/net/fddi/skfp/h/smt_p.h diff --git a/drivers/net/skfp/h/smtstate.h b/drivers/net/fddi/skfp/h/smtstate.h index 62fe695077a95..62fe695077a95 100644 --- a/drivers/net/skfp/h/smtstate.h +++ b/drivers/net/fddi/skfp/h/smtstate.h diff --git a/drivers/net/skfp/h/supern_2.h b/drivers/net/fddi/skfp/h/supern_2.h index 0b73690280f6f..0b73690280f6f 100644 --- a/drivers/net/skfp/h/supern_2.h +++ b/drivers/net/fddi/skfp/h/supern_2.h diff --git a/drivers/net/skfp/h/targethw.h b/drivers/net/fddi/skfp/h/targethw.h index 626dc72635913..626dc72635913 100644 --- a/drivers/net/skfp/h/targethw.h +++ b/drivers/net/fddi/skfp/h/targethw.h diff --git a/drivers/net/skfp/h/targetos.h b/drivers/net/fddi/skfp/h/targetos.h index 5d940e7b8ea02..5d940e7b8ea02 100644 --- a/drivers/net/skfp/h/targetos.h +++ b/drivers/net/fddi/skfp/h/targetos.h diff --git a/drivers/net/skfp/h/types.h b/drivers/net/fddi/skfp/h/types.h index 5a3bf8378f9ef..5a3bf8378f9ef 100644 --- a/drivers/net/skfp/h/types.h +++ b/drivers/net/fddi/skfp/h/types.h diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/fddi/skfp/hwmtm.c index e26398b5a7dcf..e26398b5a7dcf 100644 --- a/drivers/net/skfp/hwmtm.c +++ b/drivers/net/fddi/skfp/hwmtm.c diff --git a/drivers/net/skfp/hwt.c b/drivers/net/fddi/skfp/hwt.c index c0798fd2ca693..c0798fd2ca693 100644 --- a/drivers/net/skfp/hwt.c +++ b/drivers/net/fddi/skfp/hwt.c diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/fddi/skfp/pcmplc.c index 88d02d0a42c4a..88d02d0a42c4a 100644 --- a/drivers/net/skfp/pcmplc.c +++ b/drivers/net/fddi/skfp/pcmplc.c diff --git a/drivers/net/skfp/pmf.c b/drivers/net/fddi/skfp/pmf.c index 9ac4665d74113..9ac4665d74113 100644 --- a/drivers/net/skfp/pmf.c +++ b/drivers/net/fddi/skfp/pmf.c diff --git a/drivers/net/skfp/queue.c b/drivers/net/fddi/skfp/queue.c index c1a0df455a595..c1a0df455a595 100644 --- a/drivers/net/skfp/queue.c +++ b/drivers/net/fddi/skfp/queue.c diff --git a/drivers/net/skfp/rmt.c b/drivers/net/fddi/skfp/rmt.c index ef8d5672d9e8d..ef8d5672d9e8d 100644 --- a/drivers/net/skfp/rmt.c +++ b/drivers/net/fddi/skfp/rmt.c diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c index 3d9a4596a423d..3d9a4596a423d 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/fddi/skfp/skfddi.c diff --git a/drivers/net/skfp/smt.c b/drivers/net/fddi/skfp/smt.c index 08d94329c12ff..08d94329c12ff 100644 --- a/drivers/net/skfp/smt.c +++ b/drivers/net/fddi/skfp/smt.c diff --git a/drivers/net/skfp/smtdef.c b/drivers/net/fddi/skfp/smtdef.c index 1acab0b368e31..1acab0b368e31 100644 --- a/drivers/net/skfp/smtdef.c +++ b/drivers/net/fddi/skfp/smtdef.c diff --git a/drivers/net/skfp/smtinit.c b/drivers/net/fddi/skfp/smtinit.c index e3a0c0bc22331..e3a0c0bc22331 100644 --- a/drivers/net/skfp/smtinit.c +++ b/drivers/net/fddi/skfp/smtinit.c diff --git a/drivers/net/skfp/smttimer.c b/drivers/net/fddi/skfp/smttimer.c index 531795e98c30d..531795e98c30d 100644 --- a/drivers/net/skfp/smttimer.c +++ b/drivers/net/fddi/skfp/smttimer.c diff --git a/drivers/net/skfp/srf.c b/drivers/net/fddi/skfp/srf.c index f6f7baf9f27a7..f6f7baf9f27a7 100644 --- a/drivers/net/skfp/srf.c +++ b/drivers/net/fddi/skfp/srf.c |