Merge remote branch 'jwb/merge' into merge

[karo-tx-linux.git] / drivers / net / sunhme.h

diff --git a/drivers/net/sunhme.h b/drivers/net/sunhme.h
index efd2ca0fcad30d85362d9f0d1e2412ab49b5e7fc..756b5bf3aa89b40a6c40530e61c929a269ed05c9 100644 (file)
--- a/drivers/net/sunhme.h
+++ b/drivers/net/sunhme.h
@@ -407,7 +407,7 @@ struct happy_meal {
        void (*write_rxd)(struct happy_meal_rxd *, u32, u32);
 #endif
 
-       /* This is either an of_device or a pci_dev. */
+       /* This is either an platform_device or a pci_dev. */
        void                      *happy_dev;
        struct device             *dma_dev;