Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / ks8842.c

diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c
index 928b2b8..f0d8346 100644 (file)
--- a/drivers/net/ks8842.c
+++ b/drivers/net/ks8842.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/mfd/core.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -320,7 +321,7 @@ static void ks8842_reset_hw(struct ks8842_adapter *adapter)
        /* RX 2 kb high watermark */
        ks8842_write16(adapter, 0, 0x1000, REG_QRFCR);
 
-       /* aggresive back off in half duplex */
+       /* aggressive back off in half duplex */
        ks8842_enable_bits(adapter, 32, 1 << 8, REG_SGCR1);
 
        /* enable no excessive collison drop */
@@ -1145,7 +1146,7 @@ static int __devinit ks8842_probe(struct platform_device *pdev)
        struct resource *iomem;
        struct net_device *netdev;
        struct ks8842_adapter *adapter;
-       struct ks8842_platform_data *pdata = pdev->dev.platform_data;
+       struct ks8842_platform_data *pdata = mfd_get_data(pdev);
        u16 id;
        unsigned i;