include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / net / wireless / rt2x00 / rt2x00soc.c

diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.c b/drivers/net/wireless/rt2x00/rt2x00soc.c
index 0d6b43a..fc98063 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00soc.c
+++ b/drivers/net/wireless/rt2x00/rt2x00soc.c
@@ -28,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #include "rt2x00.h"
 #include "rt2x00soc.h"
@@ -71,9 +72,7 @@ exit:
        return -ENOMEM;
 }
 
-int rt2x00soc_probe(struct platform_device *pdev,
-                   const unsigned short chipset,
-                   const struct rt2x00_ops *ops)
+int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops)
 {
        struct ieee80211_hw *hw;
        struct rt2x00_dev *rt2x00dev;
@@ -95,7 +94,6 @@ int rt2x00soc_probe(struct platform_device *pdev,
        rt2x00dev->name = pdev->dev.driver->name;
 
        rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_SOC);
-       rt2x00_set_chip_rt(rt2x00dev, chipset);
 
        retval = rt2x00soc_alloc_reg(rt2x00dev);
        if (retval)
@@ -115,6 +113,7 @@ exit_free_device:
 
        return retval;
 }
+EXPORT_SYMBOL_GPL(rt2x00soc_probe);
 
 int rt2x00soc_remove(struct platform_device *pdev)
 {