diff --git a/[refs] b/[refs] index 8a3ebefed736..77adb48a2307 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f95d882d81ee731be2a4a3b34f86810e29b68836 +refs/heads/master: 26ba05e4c66ad3fafe08412ffcf8c328cc4640b0 diff --git a/trunk/Documentation/pci.txt b/trunk/Documentation/pci.txt index fd5028eca13e..cdf2f3c0ab14 100644 --- a/trunk/Documentation/pci.txt +++ b/trunk/Documentation/pci.txt @@ -205,8 +205,8 @@ Tips on when/where to use the above attributes: exclusively called by the probe() routine, can be marked __devinit. Ditto for remove() and __devexit. - o If mydriver_probe() is marked with __devinit(), then all address - references to mydriver_probe must use __devexit_p(mydriver_probe) + o If mydriver_remove() is marked with __devexit(), then all address + references to mydriver_remove must use __devexit_p(mydriver_remove) (in the struct pci_driver declaration for example). __devexit_p() will generate the function name _or_ NULL if the function will be discarded. For an example, see drivers/net/tg3.c.