---

yaml --- r: 65077 b: refs/heads/master c: 29c5d4a h: refs/heads/master i: 65075: 4b8a459 v: v3
git-mirror · Sep 20, 2007 · a340847 · a340847
1 parent aad52d7
commit a340847
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 301 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 460edb3cd06865ffb231eb694b567daec3113210
+refs/heads/master: 29c5d4afba51c71cfeadd3f74f3c42e064483fb0
diff --git a/trunk/drivers/ieee1394/ieee1394_core.c b/trunk/drivers/ieee1394/ieee1394_core.c
@@ -1273,7 +1273,7 @@ static void __exit ieee1394_cleanup(void)
 	unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
 }
 
-module_init(ieee1394_init);
+fs_initcall(ieee1394_init); /* same as ohci1394 */
 module_exit(ieee1394_cleanup);
 
 /* Exported symbols */

diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c
@@ -3537,5 +3537,7 @@ static int __init ohci1394_init(void)
 	return pci_register_driver(&ohci1394_pci_driver);
 }
 
-module_init(ohci1394_init);
+/* Register before most other device drivers.
+ * Useful for remote debugging via physical DMA, e.g. using firescope. */
+fs_initcall(ohci1394_init);
 module_exit(ohci1394_cleanup);
diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c
@@ -3094,12 +3094,9 @@ static void myri10ge_remove(struct pci_dev *pdev)
 }
 
 #define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E 	0x0008
-#define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9	0x0009
 
 static struct pci_device_id myri10ge_pci_tbl[] = {
 	{PCI_DEVICE(PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E)},
-	{PCI_DEVICE
-	 (PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9)},
 	{0},
 };
 

diff --git a/trunk/drivers/net/phy/phy.c b/trunk/drivers/net/phy/phy.c
@@ -409,7 +409,6 @@ int phy_mii_ioctl(struct phy_device *phydev,
 
 	return 0;
 }
-EXPORT_SYMBOL(phy_mii_ioctl);
 
 /**
  * phy_start_aneg - start auto-negotiation for this PHY device
-Original file line number
+Diff line change
@@ Expand Up / @@ -409,7 +409,6 @@ int phy_mii_ioctl(struct phy_device *phydev, @@
     	return 0;
     }
-    EXPORT_SYMBOL(phy_mii_ioctl);
     /**
      * phy_start_aneg - start auto-negotiation for this PHY device
@@ Expand Down @@