---

yaml --- r: 289829 b: refs/heads/master c: 8b1c36b h: refs/heads/master i: 289827: 80bd205 v: v3
git-mirror · Jan 30, 2012 · 26d50b4 · 26d50b4
1 parent d6b93b5
commit 26d50b4
Show file tree

Hide file tree

Showing 65 changed files with 441 additions and 492 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a46621a3a8f24557201a7ef62de151c812f8985c
+refs/heads/master: 8b1c36b357153f491ddea5363fdd397109c3326f
diff --git a/trunk/Documentation/magic-number.txt b/trunk/Documentation/magic-number.txt
@@ -89,7 +89,7 @@ TTY_DRIVER_MAGIC      0x5402      tty_driver        include/linux/tty_driver.h
 MGSLPC_MAGIC          0x5402      mgslpc_info       drivers/char/pcmcia/synclink_cs.c
 TTY_LDISC_MAGIC       0x5403      tty_ldisc         include/linux/tty_ldisc.h
 USB_SERIAL_MAGIC      0x6702      usb_serial        drivers/usb/serial/usb-serial.h
-FULL_DUPLEX_MAGIC     0x6969                        drivers/net/ethernet/dec/tulip/de2104x.c
+FULL_DUPLEX_MAGIC     0x6969                        drivers/net/tulip/de2104x.c
 USB_BLUETOOTH_MAGIC   0x6d02      usb_bluetooth     drivers/usb/class/bluetty.c
 RFCOMM_TTY_MAGIC      0x6d02                        net/bluetooth/rfcomm/tty.c
 USB_SERIAL_PORT_MAGIC 0x7301      usb_serial_port   drivers/usb/serial/usb-serial.h

diff --git a/trunk/Documentation/networking/phy.txt b/trunk/Documentation/networking/phy.txt
@@ -62,8 +62,7 @@ The MDIO bus
  5) The bus must also be declared somewhere as a device, and registered.
 
  As an example for how one driver implemented an mdio bus driver, see
- drivers/net/ethernet/freescale/fsl_pq_mdio.c and an associated DTS file
- for one of the users. (e.g. "git grep fsl,.*-mdio arch/powerpc/boot/dts/")
+ drivers/net/gianfar_mii.c and arch/ppc/syslib/mpc85xx_devices.c
 
 Connecting to a PHY
 

diff --git a/trunk/Documentation/zh_CN/magic-number.txt b/trunk/Documentation/zh_CN/magic-number.txt
@@ -89,7 +89,7 @@ TTY_DRIVER_MAGIC      0x5402      tty_driver        include/linux/tty_driver.h
 MGSLPC_MAGIC          0x5402      mgslpc_info       drivers/char/pcmcia/synclink_cs.c
 TTY_LDISC_MAGIC       0x5403      tty_ldisc         include/linux/tty_ldisc.h
 USB_SERIAL_MAGIC      0x6702      usb_serial        drivers/usb/serial/usb-serial.h
-FULL_DUPLEX_MAGIC     0x6969                        drivers/net/ethernet/dec/tulip/de2104x.c
+FULL_DUPLEX_MAGIC     0x6969                        drivers/net/tulip/de2104x.c
 USB_BLUETOOTH_MAGIC   0x6d02      usb_bluetooth     drivers/usb/class/bluetty.c
 RFCOMM_TTY_MAGIC      0x6d02                        net/bluetooth/rfcomm/tty.c
 USB_SERIAL_PORT_MAGIC 0x7301      usb_serial_port   drivers/usb/serial/usb-serial.h

diff --git a/trunk/drivers/net/can/slcan.c b/trunk/drivers/net/can/slcan.c
@@ -1,7 +1,7 @@
 /*
  * slcan.c - serial line CAN interface driver (using tty line discipline)
  *
- * This file is derived from linux/drivers/net/slip/slip.c
+ * This file is derived from linux/drivers/net/slip.c
  *
  * slip.c Authors  : Laurence Culhane <loz@holmes.demon.co.uk>
  *                   Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>

diff --git a/trunk/drivers/net/ethernet/3com/Kconfig b/trunk/drivers/net/ethernet/3com/Kconfig
@@ -97,7 +97,7 @@ config VORTEX
 	  available from <http://www.tldp.org/docs.html#howto>. More
 	  specific information is in
 	  <file:Documentation/networking/vortex.txt> and in the comments at
-	  the beginning of <file:drivers/net/ethernet/3com/3c59x.c>.
+	  the beginning of <file:drivers/net/3c59x.c>.
 
 	  To compile this support as a module, choose M here.
 

diff --git a/trunk/drivers/net/ethernet/8390/ax88796.c b/trunk/drivers/net/ethernet/8390/ax88796.c
@@ -1,4 +1,4 @@
-/* drivers/net/ethernet/8390/ax88796.c
+/* drivers/net/ax88796.c
  *
  * Copyright 2005,2007 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>

diff --git a/trunk/drivers/net/ethernet/8390/axnet_cs.c b/trunk/drivers/net/ethernet/8390/axnet_cs.c
@@ -192,7 +192,7 @@ static int get_prom(struct pcmcia_device *link)
     unsigned int ioaddr = dev->base_addr;
     int i, j;
 
-    /* This is based on drivers/net/ethernet/8390/ne.c */
+    /* This is based on drivers/net/ne.c */
     struct {
 	u_char value, offset;
     } program_seq[] = {

diff --git a/trunk/drivers/net/ethernet/8390/pcnet_cs.c b/trunk/drivers/net/ethernet/8390/pcnet_cs.c
@@ -326,7 +326,7 @@ static hw_info_t *get_prom(struct pcmcia_device *link)
     u_char prom[32];
     int i, j;
 
-    /* This is lifted straight from drivers/net/ethernet/8390/ne.c */
+    /* This is lifted straight from drivers/net/ne.c */
     struct {
 	u_char value, offset;
     } program_seq[] = {

diff --git a/trunk/drivers/net/ethernet/amd/Kconfig b/trunk/drivers/net/ethernet/amd/Kconfig
@@ -113,7 +113,7 @@ config DEPCA
 	  If you have a network (Ethernet) card of this type, say Y and read
 	  the Ethernet-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto> as well as
-	  <file:drivers/net/ethernet/amd/depca.c>.
+	  <file:drivers/net/depca.c>.
 
 	  To compile this driver as a module, choose M here. The module
 	  will be called depca.

diff --git a/trunk/drivers/net/ethernet/amd/am79c961a.c b/trunk/drivers/net/ethernet/amd/am79c961a.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ethernet/amd/am79c961a.c
+ *  linux/drivers/net/am79c961.c
  *
  *  by Russell King <rmk@arm.linux.org.uk> 1995-2001.
  *

diff --git a/trunk/drivers/net/ethernet/amd/am79c961a.h b/trunk/drivers/net/ethernet/amd/am79c961a.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/net/ethernet/amd/am79c961a.h
+ * linux/drivers/net/arm/am79c961a.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

diff --git a/trunk/drivers/net/ethernet/dec/tulip/21142.c b/trunk/drivers/net/ethernet/dec/tulip/21142.c
@@ -1,5 +1,5 @@
 /*
-	drivers/net/ethernet/dec/tulip/21142.c
+	drivers/net/tulip/21142.c
 
 	Copyright 2000,2001  The Linux Kernel Team
 	Written/copyright 1994-2001 by Donald Becker.

diff --git a/trunk/drivers/net/ethernet/dec/tulip/eeprom.c b/trunk/drivers/net/ethernet/dec/tulip/eeprom.c
@@ -1,5 +1,5 @@
 /*
-	drivers/net/ethernet/dec/tulip/eeprom.c
+	drivers/net/tulip/eeprom.c
 
 	Copyright 2000,2001  The Linux Kernel Team
 	Written/copyright 1994-2001 by Donald Becker.

diff --git a/trunk/drivers/net/ethernet/dec/tulip/interrupt.c b/trunk/drivers/net/ethernet/dec/tulip/interrupt.c
@@ -1,5 +1,5 @@
 /*
-	drivers/net/ethernet/dec/tulip/interrupt.c
+	drivers/net/tulip/interrupt.c
 
 	Copyright 2000,2001  The Linux Kernel Team
 	Written/copyright 1994-2001 by Donald Becker.

diff --git a/trunk/drivers/net/ethernet/dec/tulip/media.c b/trunk/drivers/net/ethernet/dec/tulip/media.c
@@ -1,5 +1,5 @@
 /*
-	drivers/net/ethernet/dec/tulip/media.c
+	drivers/net/tulip/media.c
 
 	Copyright 2000,2001  The Linux Kernel Team
 	Written/copyright 1994-2001 by Donald Becker.

diff --git a/trunk/drivers/net/ethernet/dec/tulip/pnic.c b/trunk/drivers/net/ethernet/dec/tulip/pnic.c
@@ -1,5 +1,5 @@
 /*
-	drivers/net/ethernet/dec/tulip/pnic.c
+	drivers/net/tulip/pnic.c
 
 	Copyright 2000,2001  The Linux Kernel Team
 	Written/copyright 1994-2001 by Donald Becker.

diff --git a/trunk/drivers/net/ethernet/dec/tulip/pnic2.c b/trunk/drivers/net/ethernet/dec/tulip/pnic2.c
@@ -1,5 +1,5 @@
 /*
-	drivers/net/ethernet/dec/tulip/pnic2.c
+	drivers/net/tulip/pnic2.c
 
 	Copyright 2000,2001  The Linux Kernel Team
 	Written/copyright 1994-2001 by Donald Becker.

diff --git a/trunk/drivers/net/ethernet/dec/tulip/timer.c b/trunk/drivers/net/ethernet/dec/tulip/timer.c
@@ -1,5 +1,5 @@
 /*
-	drivers/net/ethernet/dec/tulip/timer.c
+	drivers/net/tulip/timer.c
 
 	Copyright 2000,2001  The Linux Kernel Team
 	Written/copyright 1994-2001 by Donald Becker.

diff --git a/trunk/drivers/net/ethernet/dec/tulip/tulip.h b/trunk/drivers/net/ethernet/dec/tulip/tulip.h
@@ -1,5 +1,5 @@
 /*
-	drivers/net/ethernet/dec/tulip/tulip.h
+	drivers/net/tulip/tulip.h
 
 	Copyright 2000,2001  The Linux Kernel Team
 	Written/copyright 1994-2001 by Donald Becker.

diff --git a/trunk/drivers/net/ethernet/ethoc.c b/trunk/drivers/net/ethernet/ethoc.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/net/ethernet/ethoc.c
+ * linux/drivers/net/ethoc.c
  *
  * Copyright (C) 2007-2008 Avionic Design Development GmbH
  * Copyright (C) 2008-2009 Avionic Design GmbH

diff --git a/trunk/drivers/net/ethernet/freescale/fec_mpc52xx.h b/trunk/drivers/net/ethernet/freescale/fec_mpc52xx.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/freescale/fec_mpc52xx.h
+ * drivers/drivers/net/fec_mpc52xx/fec.h
  *
  * Driver for the MPC5200 Fast Ethernet Controller
  *

diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/freescale/gianfar.c
+ * drivers/net/gianfar.c
  *
  * Gianfar Ethernet Driver
  * This driver is designed for the non-CPM ethernet controllers

diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.h b/trunk/drivers/net/ethernet/freescale/gianfar.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/freescale/gianfar.h
+ * drivers/net/gianfar.h
  *
  * Gianfar Ethernet Driver
  * Driver for FEC on MPC8540 and TSEC on MPC8540/MPC8560

diff --git a/trunk/drivers/net/ethernet/freescale/gianfar_ethtool.c b/trunk/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -1,5 +1,5 @@
 /*
- *  drivers/net/ethernet/freescale/gianfar_ethtool.c
+ *  drivers/net/gianfar_ethtool.c
  *
  *  Gianfar Ethernet Driver
  *  Ethtool support for Gianfar Enet

diff --git a/trunk/drivers/net/ethernet/freescale/gianfar_sysfs.c b/trunk/drivers/net/ethernet/freescale/gianfar_sysfs.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/freescale/gianfar_sysfs.c
+ * drivers/net/gianfar_sysfs.c
  *
  * Gianfar Ethernet Driver
  * This driver is designed for the non-CPM ethernet controllers

diff --git a/trunk/drivers/net/ethernet/i825xx/sun3_82586.c b/trunk/drivers/net/ethernet/i825xx/sun3_82586.c
@@ -28,6 +28,7 @@ static int automatic_resume = 0; /* experimental .. better should be zero */
 static int rfdadd = 0; /* rfdadd=1 may be better for 8K MEM cards */
 static int fifo=0x8;	/* don't change */
 
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -1150,6 +1151,28 @@ static void set_multicast_list(struct net_device *dev)
 	netif_wake_queue(dev);
 }
 
+#ifdef MODULE
+#error This code is not currently supported as a module
+static struct net_device *dev_sun3_82586;
+
+int init_module(void)
+{
+	dev_sun3_82586 = sun3_82586_probe(-1);
+	if (IS_ERR(dev_sun3_82586))
+		return PTR_ERR(dev_sun3_82586);
+	return 0;
+}
+
+void cleanup_module(void)
+{
+	unsigned long ioaddr = dev_sun3_82586->base_addr;
+	unregister_netdev(dev_sun3_82586);
+	release_region(ioaddr, SUN3_82586_TOTAL_SIZE);
+	iounmap((void *)ioaddr);
+	free_netdev(dev_sun3_82586);
+}
+#endif /* MODULE */
+
 #if 0
 /*
  * DUMP .. we expect a not running CMD unit and enough space
@@ -1186,3 +1209,5 @@ void sun3_82586_dump(struct net_device *dev,void *ptr)
 	printk("\n");
 }
 #endif
+
+MODULE_LICENSE("GPL");
diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea.h b/trunk/drivers/net/ethernet/ibm/ehea/ehea.h
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea.h
+ *  linux/drivers/net/ehea/ehea.h
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *

diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c b/trunk/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
+ *  linux/drivers/net/ehea/ehea_ethtool.c
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *

diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_hw.h b/trunk/drivers/net/ethernet/ibm/ehea/ehea_hw.h
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_hw.h
+ *  linux/drivers/net/ehea/ehea_hw.h
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *

diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c b/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_main.c
+ *  linux/drivers/net/ehea/ehea_main.c
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *

diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_phyp.c b/trunk/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
+ *  linux/drivers/net/ehea/ehea_phyp.c
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *

diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_phyp.h b/trunk/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
+ *  linux/drivers/net/ehea/ehea_phyp.h
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *

diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
+ *  linux/drivers/net/ehea/ehea_qmr.c
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *

diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.h b/trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
+ *  linux/drivers/net/ehea/ehea_qmr.h
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/core.c b/trunk/drivers/net/ethernet/ibm/emac/core.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/core.c
+ * drivers/net/ibm_newemac/core.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller.
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/core.h b/trunk/drivers/net/ethernet/ibm/emac/core.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/core.h
+ * drivers/net/ibm_newemac/core.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller.
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/debug.c b/trunk/drivers/net/ethernet/ibm/emac/debug.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/debug.c
+ * drivers/net/ibm_newemac/debug.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/debug.h b/trunk/drivers/net/ethernet/ibm/emac/debug.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/debug.h
+ * drivers/net/ibm_newemac/debug.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/emac.h b/trunk/drivers/net/ethernet/ibm/emac/emac.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/emac.h
+ * drivers/net/ibm_newemac/emac.h
  *
  * Register definitions for PowerPC 4xx on-chip ethernet contoller
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/mal.c b/trunk/drivers/net/ethernet/ibm/emac/mal.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/mal.c
+ * drivers/net/ibm_newemac/mal.c
  *
  * Memory Access Layer (MAL) support
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/mal.h b/trunk/drivers/net/ethernet/ibm/emac/mal.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/mal.h
+ * drivers/net/ibm_newemac/mal.h
  *
  * Memory Access Layer (MAL) support
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/phy.c b/trunk/drivers/net/ethernet/ibm/emac/phy.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/phy.c
+ * drivers/net/ibm_newemac/phy.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, PHY support.
  * Borrowed from sungem_phy.c, though I only kept the generic MII

diff --git a/trunk/drivers/net/ethernet/ibm/emac/phy.h b/trunk/drivers/net/ethernet/ibm/emac/phy.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/phy.h
+ * drivers/net/ibm_newemac/phy.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, PHY support
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/rgmii.c b/trunk/drivers/net/ethernet/ibm/emac/rgmii.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/rgmii.c
+ * drivers/net/ibm_newemac/rgmii.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/rgmii.h b/trunk/drivers/net/ethernet/ibm/emac/rgmii.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/rgmii.h
+ * drivers/net/ibm_newemac/rgmii.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/tah.c b/trunk/drivers/net/ethernet/ibm/emac/tah.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/tah.c
+ * drivers/net/ibm_newemac/tah.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, TAH support.
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/tah.h b/trunk/drivers/net/ethernet/ibm/emac/tah.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/tah.h
+ * drivers/net/ibm_newemac/tah.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, TAH support.
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/zmii.c b/trunk/drivers/net/ethernet/ibm/emac/zmii.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/zmii.c
+ * drivers/net/ibm_newemac/zmii.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support.
  *

diff --git a/trunk/drivers/net/ethernet/ibm/emac/zmii.h b/trunk/drivers/net/ethernet/ibm/emac/zmii.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ethernet/ibm/emac/zmii.h
+ * drivers/net/ibm_newemac/zmii.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support.
  *