Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

[deliverable/linux.git] / drivers / net / pcnet32.c

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 9595f74da93f46d893d3b3e2950c0909c344443e..07c31f19c6ba40d419b2d022d069af321130f73f 100644 (file)
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1167,8 +1167,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
         * station address PROM at the base address and programmed into the
         * "Physical Address Registers" CSR12-14.
         * As a precautionary measure, we read the PROM values and complain if
-        * they disagree with the CSRs.  Either way, we use the CSR values, and
-        * double check that they are valid.
+        * they disagree with the CSRs.  If they miscompare, and the PROM addr
+        * is valid, then the PROM addr is used.
         */
        for (i = 0; i < 3; i++) {
                unsigned int val;