tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drivers/net: fix up stale paths from driver reorg

The reorganization of the driver layout in drivers/net
left behind some stale paths in comments and in Kconfig
help text. Bring them up to date. No actual change to
any code takes place here.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Paul Gortmaker and committed by
David S. Miller 3396c782 e94d5b7a

+59 -58
+1 -1
Documentation/magic-number.txt
··· 89 89 MGSLPC_MAGIC 0x5402 mgslpc_info drivers/char/pcmcia/synclink_cs.c 90 90 TTY_LDISC_MAGIC 0x5403 tty_ldisc include/linux/tty_ldisc.h 91 91 USB_SERIAL_MAGIC 0x6702 usb_serial drivers/usb/serial/usb-serial.h 92 - FULL_DUPLEX_MAGIC 0x6969 drivers/net/tulip/de2104x.c 92 + FULL_DUPLEX_MAGIC 0x6969 drivers/net/ethernet/dec/tulip/de2104x.c 93 93 USB_BLUETOOTH_MAGIC 0x6d02 usb_bluetooth drivers/usb/class/bluetty.c 94 94 RFCOMM_TTY_MAGIC 0x6d02 net/bluetooth/rfcomm/tty.c 95 95 USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port drivers/usb/serial/usb-serial.h
+2 -1
Documentation/networking/phy.txt
··· 62 62 5) The bus must also be declared somewhere as a device, and registered. 63 63 64 64 As an example for how one driver implemented an mdio bus driver, see 65 - drivers/net/gianfar_mii.c and arch/ppc/syslib/mpc85xx_devices.c 65 + drivers/net/ethernet/freescale/fsl_pq_mdio.c and an associated DTS file 66 + for one of the users. (e.g. "git grep fsl,.*-mdio arch/powerpc/boot/dts/") 66 67 67 68 Connecting to a PHY 68 69
+1 -1
Documentation/zh_CN/magic-number.txt
··· 89 89 MGSLPC_MAGIC 0x5402 mgslpc_info drivers/char/pcmcia/synclink_cs.c 90 90 TTY_LDISC_MAGIC 0x5403 tty_ldisc include/linux/tty_ldisc.h 91 91 USB_SERIAL_MAGIC 0x6702 usb_serial drivers/usb/serial/usb-serial.h 92 - FULL_DUPLEX_MAGIC 0x6969 drivers/net/tulip/de2104x.c 92 + FULL_DUPLEX_MAGIC 0x6969 drivers/net/ethernet/dec/tulip/de2104x.c 93 93 USB_BLUETOOTH_MAGIC 0x6d02 usb_bluetooth drivers/usb/class/bluetty.c 94 94 RFCOMM_TTY_MAGIC 0x6d02 net/bluetooth/rfcomm/tty.c 95 95 USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port drivers/usb/serial/usb-serial.h
+1 -1
drivers/net/can/slcan.c
··· 1 1 /* 2 2 * slcan.c - serial line CAN interface driver (using tty line discipline) 3 3 * 4 - * This file is derived from linux/drivers/net/slip.c 4 + * This file is derived from linux/drivers/net/slip/slip.c 5 5 * 6 6 * slip.c Authors : Laurence Culhane <loz@holmes.demon.co.uk> 7 7 * Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>
+1 -1
drivers/net/ethernet/3com/Kconfig
··· 97 97 available from <http://www.tldp.org/docs.html#howto>. More 98 98 specific information is in 99 99 <file:Documentation/networking/vortex.txt> and in the comments at 100 - the beginning of <file:drivers/net/3c59x.c>. 100 + the beginning of <file:drivers/net/ethernet/3com/3c59x.c>. 101 101 102 102 To compile this support as a module, choose M here. 103 103
+1 -1
drivers/net/ethernet/8390/ax88796.c
··· 1 - /* drivers/net/ax88796.c 1 + /* drivers/net/ethernet/8390/ax88796.c 2 2 * 3 3 * Copyright 2005,2007 Simtec Electronics 4 4 * Ben Dooks <ben@simtec.co.uk>
+1 -1
drivers/net/ethernet/8390/axnet_cs.c
··· 192 192 unsigned int ioaddr = dev->base_addr; 193 193 int i, j; 194 194 195 - /* This is based on drivers/net/ne.c */ 195 + /* This is based on drivers/net/ethernet/8390/ne.c */ 196 196 struct { 197 197 u_char value, offset; 198 198 } program_seq[] = {
+1 -1
drivers/net/ethernet/8390/pcnet_cs.c
··· 326 326 u_char prom[32]; 327 327 int i, j; 328 328 329 - /* This is lifted straight from drivers/net/ne.c */ 329 + /* This is lifted straight from drivers/net/ethernet/8390/ne.c */ 330 330 struct { 331 331 u_char value, offset; 332 332 } program_seq[] = {
+1 -1
drivers/net/ethernet/amd/Kconfig
··· 113 113 If you have a network (Ethernet) card of this type, say Y and read 114 114 the Ethernet-HOWTO, available from 115 115 <http://www.tldp.org/docs.html#howto> as well as 116 - <file:drivers/net/depca.c>. 116 + <file:drivers/net/ethernet/amd/depca.c>. 117 117 118 118 To compile this driver as a module, choose M here. The module 119 119 will be called depca.
+1 -1
drivers/net/ethernet/amd/am79c961a.c
··· 1 1 /* 2 - * linux/drivers/net/am79c961.c 2 + * linux/drivers/net/ethernet/amd/am79c961a.c 3 3 * 4 4 * by Russell King <rmk@arm.linux.org.uk> 1995-2001. 5 5 *
+1 -1
drivers/net/ethernet/amd/am79c961a.h
··· 1 1 /* 2 - * linux/drivers/net/arm/am79c961a.h 2 + * linux/drivers/net/ethernet/amd/am79c961a.h 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify 5 5 * it under the terms of the GNU General Public License version 2 as
+1 -1
drivers/net/ethernet/dec/tulip/21142.c
··· 1 1 /* 2 - drivers/net/tulip/21142.c 2 + drivers/net/ethernet/dec/tulip/21142.c 3 3 4 4 Copyright 2000,2001 The Linux Kernel Team 5 5 Written/copyright 1994-2001 by Donald Becker.
+1 -1
drivers/net/ethernet/dec/tulip/eeprom.c
··· 1 1 /* 2 - drivers/net/tulip/eeprom.c 2 + drivers/net/ethernet/dec/tulip/eeprom.c 3 3 4 4 Copyright 2000,2001 The Linux Kernel Team 5 5 Written/copyright 1994-2001 by Donald Becker.
+1 -1
drivers/net/ethernet/dec/tulip/interrupt.c
··· 1 1 /* 2 - drivers/net/tulip/interrupt.c 2 + drivers/net/ethernet/dec/tulip/interrupt.c 3 3 4 4 Copyright 2000,2001 The Linux Kernel Team 5 5 Written/copyright 1994-2001 by Donald Becker.
+1 -1
drivers/net/ethernet/dec/tulip/media.c
··· 1 1 /* 2 - drivers/net/tulip/media.c 2 + drivers/net/ethernet/dec/tulip/media.c 3 3 4 4 Copyright 2000,2001 The Linux Kernel Team 5 5 Written/copyright 1994-2001 by Donald Becker.
+1 -1
drivers/net/ethernet/dec/tulip/pnic.c
··· 1 1 /* 2 - drivers/net/tulip/pnic.c 2 + drivers/net/ethernet/dec/tulip/pnic.c 3 3 4 4 Copyright 2000,2001 The Linux Kernel Team 5 5 Written/copyright 1994-2001 by Donald Becker.
+1 -1
drivers/net/ethernet/dec/tulip/pnic2.c
··· 1 1 /* 2 - drivers/net/tulip/pnic2.c 2 + drivers/net/ethernet/dec/tulip/pnic2.c 3 3 4 4 Copyright 2000,2001 The Linux Kernel Team 5 5 Written/copyright 1994-2001 by Donald Becker.
+1 -1
drivers/net/ethernet/dec/tulip/timer.c
··· 1 1 /* 2 - drivers/net/tulip/timer.c 2 + drivers/net/ethernet/dec/tulip/timer.c 3 3 4 4 Copyright 2000,2001 The Linux Kernel Team 5 5 Written/copyright 1994-2001 by Donald Becker.
+1 -1
drivers/net/ethernet/dec/tulip/tulip.h
··· 1 1 /* 2 - drivers/net/tulip/tulip.h 2 + drivers/net/ethernet/dec/tulip/tulip.h 3 3 4 4 Copyright 2000,2001 The Linux Kernel Team 5 5 Written/copyright 1994-2001 by Donald Becker.
+1 -1
drivers/net/ethernet/ethoc.c
··· 1 1 /* 2 - * linux/drivers/net/ethoc.c 2 + * linux/drivers/net/ethernet/ethoc.c 3 3 * 4 4 * Copyright (C) 2007-2008 Avionic Design Development GmbH 5 5 * Copyright (C) 2008-2009 Avionic Design GmbH
+1 -1
drivers/net/ethernet/freescale/fec_mpc52xx.h
··· 1 1 /* 2 - * drivers/drivers/net/fec_mpc52xx/fec.h 2 + * drivers/net/ethernet/freescale/fec_mpc52xx.h 3 3 * 4 4 * Driver for the MPC5200 Fast Ethernet Controller 5 5 *
+1 -1
drivers/net/ethernet/freescale/gianfar.c
··· 1 1 /* 2 - * drivers/net/gianfar.c 2 + * drivers/net/ethernet/freescale/gianfar.c 3 3 * 4 4 * Gianfar Ethernet Driver 5 5 * This driver is designed for the non-CPM ethernet controllers
+1 -1
drivers/net/ethernet/freescale/gianfar.h
··· 1 1 /* 2 - * drivers/net/gianfar.h 2 + * drivers/net/ethernet/freescale/gianfar.h 3 3 * 4 4 * Gianfar Ethernet Driver 5 5 * Driver for FEC on MPC8540 and TSEC on MPC8540/MPC8560
+1 -1
drivers/net/ethernet/freescale/gianfar_ethtool.c
··· 1 1 /* 2 - * drivers/net/gianfar_ethtool.c 2 + * drivers/net/ethernet/freescale/gianfar_ethtool.c 3 3 * 4 4 * Gianfar Ethernet Driver 5 5 * Ethtool support for Gianfar Enet
+1 -1
drivers/net/ethernet/freescale/gianfar_sysfs.c
··· 1 1 /* 2 - * drivers/net/gianfar_sysfs.c 2 + * drivers/net/ethernet/freescale/gianfar_sysfs.c 3 3 * 4 4 * Gianfar Ethernet Driver 5 5 * This driver is designed for the non-CPM ethernet controllers
+1 -1
drivers/net/ethernet/ibm/ehea/ehea.h
··· 1 1 /* 2 - * linux/drivers/net/ehea/ehea.h 2 + * linux/drivers/net/ethernet/ibm/ehea/ehea.h 3 3 * 4 4 * eHEA ethernet device driver for IBM eServer System p 5 5 *
+1 -1
drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
··· 1 1 /* 2 - * linux/drivers/net/ehea/ehea_ethtool.c 2 + * linux/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c 3 3 * 4 4 * eHEA ethernet device driver for IBM eServer System p 5 5 *
+1 -1
drivers/net/ethernet/ibm/ehea/ehea_hw.h
··· 1 1 /* 2 - * linux/drivers/net/ehea/ehea_hw.h 2 + * linux/drivers/net/ethernet/ibm/ehea/ehea_hw.h 3 3 * 4 4 * eHEA ethernet device driver for IBM eServer System p 5 5 *
+1 -1
drivers/net/ethernet/ibm/ehea/ehea_main.c
··· 1 1 /* 2 - * linux/drivers/net/ehea/ehea_main.c 2 + * linux/drivers/net/ethernet/ibm/ehea/ehea_main.c 3 3 * 4 4 * eHEA ethernet device driver for IBM eServer System p 5 5 *
+1 -1
drivers/net/ethernet/ibm/ehea/ehea_phyp.c
··· 1 1 /* 2 - * linux/drivers/net/ehea/ehea_phyp.c 2 + * linux/drivers/net/ethernet/ibm/ehea/ehea_phyp.c 3 3 * 4 4 * eHEA ethernet device driver for IBM eServer System p 5 5 *
+1 -1
drivers/net/ethernet/ibm/ehea/ehea_phyp.h
··· 1 1 /* 2 - * linux/drivers/net/ehea/ehea_phyp.h 2 + * linux/drivers/net/ethernet/ibm/ehea/ehea_phyp.h 3 3 * 4 4 * eHEA ethernet device driver for IBM eServer System p 5 5 *
+1 -1
drivers/net/ethernet/ibm/ehea/ehea_qmr.c
··· 1 1 /* 2 - * linux/drivers/net/ehea/ehea_qmr.c 2 + * linux/drivers/net/ethernet/ibm/ehea/ehea_qmr.c 3 3 * 4 4 * eHEA ethernet device driver for IBM eServer System p 5 5 *
+1 -1
drivers/net/ethernet/ibm/ehea/ehea_qmr.h
··· 1 1 /* 2 - * linux/drivers/net/ehea/ehea_qmr.h 2 + * linux/drivers/net/ethernet/ibm/ehea/ehea_qmr.h 3 3 * 4 4 * eHEA ethernet device driver for IBM eServer System p 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/core.c
··· 1 1 /* 2 - * drivers/net/ibm_newemac/core.c 2 + * drivers/net/ethernet/ibm/emac/core.c 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller. 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/core.h
··· 1 1 /* 2 - * drivers/net/ibm_newemac/core.h 2 + * drivers/net/ethernet/ibm/emac/core.h 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller. 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/debug.c
··· 1 1 /* 2 - * drivers/net/ibm_newemac/debug.c 2 + * drivers/net/ethernet/ibm/emac/debug.c 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines. 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/debug.h
··· 1 1 /* 2 - * drivers/net/ibm_newemac/debug.h 2 + * drivers/net/ethernet/ibm/emac/debug.h 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines. 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/emac.h
··· 1 1 /* 2 - * drivers/net/ibm_newemac/emac.h 2 + * drivers/net/ethernet/ibm/emac/emac.h 3 3 * 4 4 * Register definitions for PowerPC 4xx on-chip ethernet contoller 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/mal.c
··· 1 1 /* 2 - * drivers/net/ibm_newemac/mal.c 2 + * drivers/net/ethernet/ibm/emac/mal.c 3 3 * 4 4 * Memory Access Layer (MAL) support 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/mal.h
··· 1 1 /* 2 - * drivers/net/ibm_newemac/mal.h 2 + * drivers/net/ethernet/ibm/emac/mal.h 3 3 * 4 4 * Memory Access Layer (MAL) support 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/phy.c
··· 1 1 /* 2 - * drivers/net/ibm_newemac/phy.c 2 + * drivers/net/ethernet/ibm/emac/phy.c 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, PHY support. 5 5 * Borrowed from sungem_phy.c, though I only kept the generic MII
+1 -1
drivers/net/ethernet/ibm/emac/phy.h
··· 1 1 /* 2 - * drivers/net/ibm_newemac/phy.h 2 + * drivers/net/ethernet/ibm/emac/phy.h 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, PHY support 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/rgmii.c
··· 1 1 /* 2 - * drivers/net/ibm_newemac/rgmii.c 2 + * drivers/net/ethernet/ibm/emac/rgmii.c 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support. 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/rgmii.h
··· 1 1 /* 2 - * drivers/net/ibm_newemac/rgmii.h 2 + * drivers/net/ethernet/ibm/emac/rgmii.h 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support. 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/tah.c
··· 1 1 /* 2 - * drivers/net/ibm_newemac/tah.c 2 + * drivers/net/ethernet/ibm/emac/tah.c 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, TAH support. 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/tah.h
··· 1 1 /* 2 - * drivers/net/ibm_newemac/tah.h 2 + * drivers/net/ethernet/ibm/emac/tah.h 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, TAH support. 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/zmii.c
··· 1 1 /* 2 - * drivers/net/ibm_newemac/zmii.c 2 + * drivers/net/ethernet/ibm/emac/zmii.c 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support. 5 5 *
+1 -1
drivers/net/ethernet/ibm/emac/zmii.h
··· 1 1 /* 2 - * drivers/net/ibm_newemac/zmii.h 2 + * drivers/net/ethernet/ibm/emac/zmii.h 3 3 * 4 4 * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support. 5 5 *
+1 -1
drivers/net/ethernet/micrel/ks8851.c
··· 1 - /* drivers/net/ks8851.c 1 + /* drivers/net/ethernet/micrel/ks8851.c 2 2 * 3 3 * Copyright 2009 Simtec Electronics 4 4 * http://www.simtec.co.uk/
+1 -1
drivers/net/ethernet/micrel/ks8851.h
··· 1 - /* drivers/net/ks8851.h 1 + /* drivers/net/ethernet/micrel/ks8851.h 2 2 * 3 3 * Copyright 2009 Simtec Electronics 4 4 * Ben Dooks <ben@simtec.co.uk>
+1 -1
drivers/net/ethernet/micrel/ks8851_mll.c
··· 1 1 /** 2 - * drivers/net/ks8851_mll.c 2 + * drivers/net/ethernet/micrel/ks8851_mll.c 3 3 * Copyright (c) 2009 Micrel Inc. 4 4 * 5 5 * This program is free software; you can redistribute it and/or modify
+1 -1
drivers/net/ethernet/micrel/ksz884x.c
··· 1 1 /** 2 - * drivers/net/ksx884x.c - Micrel KSZ8841/2 PCI Ethernet driver 2 + * drivers/net/ethernet/micrel/ksx884x.c - Micrel KSZ8841/2 PCI Ethernet driver 3 3 * 4 4 * Copyright (c) 2009-2010 Micrel, Inc. 5 5 * Tristram Ha <Tristram.Ha@micrel.com>
+1 -1
drivers/net/ethernet/netx-eth.c
··· 1 1 /* 2 - * drivers/net/netx-eth.c 2 + * drivers/net/ethernet/netx-eth.c 3 3 * 4 4 * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix 5 5 *
+5 -5
drivers/net/ethernet/realtek/Kconfig
··· 24 24 select CRC32 25 25 ---help--- 26 26 This is a network (Ethernet) device which attaches to your parallel 27 - port. Read <file:drivers/net/atp.c> as well as the Ethernet-HOWTO, 28 - available from <http://www.tldp.org/docs.html#howto>, if you 29 - want to use this. If you intend to use this driver, you should have 30 - said N to the "Parallel printer support", because the two drivers 31 - don't like each other. 27 + port. Read <file:drivers/net/ethernet/realtek/atp.c> as well as the 28 + Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>, 29 + if you want to use this. If you intend to use this driver, you 30 + should have said N to the "Parallel printer support", because the two 31 + drivers don't like each other. 32 32 33 33 To compile this driver as a module, choose M here: the module 34 34 will be called atp.