3 files changed, 18 insertions, 13 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800mmio.c b/drivers/net/wireless/rt2x00/rt2800mmio.c
index 7e8c22445b7b..ae152280e071 100644
--- a/drivers/net/wireless/rt2x00/rt2800mmio.c
+++ b/drivers/net/wireless/rt2x00/rt2800mmio.c
@@ -852,6 +852,21 @@ int rt2800mmio_init_registers(struct rt2x00_dev *rt2x00dev)
 }
 EXPORT_SYMBOL_GPL(rt2800mmio_init_registers);
 
+/*
+ * Device state switch handlers.
+ */
+int rt2800mmio_enable_radio(struct rt2x00_dev *rt2x00dev)
+{
+        /* Wait for DMA, ignore error until we initialize queues. */
+        rt2800_wait_wpdma_ready(rt2x00dev);
+
+        if (unlikely(rt2800mmio_init_queues(rt2x00dev)))
+                return -EIO;
+
+        return rt2800_enable_radio(rt2x00dev);
+}
+EXPORT_SYMBOL_GPL(rt2800mmio_enable_radio);
+
 MODULE_AUTHOR(DRV_PROJECT);
 MODULE_VERSION(DRV_VERSION);
 MODULE_DESCRIPTION("rt2800 MMIO library");
diff --git a/drivers/net/wireless/rt2x00/rt2800mmio.h b/drivers/net/wireless/rt2x00/rt2800mmio.h
index 392895a3208e..6a10de3eee3e 100644
--- a/drivers/net/wireless/rt2x00/rt2800mmio.h
+++ b/drivers/net/wireless/rt2x00/rt2800mmio.h
@@ -159,4 +159,7 @@ void rt2800mmio_clear_entry(struct queue_entry *entry);
 int rt2800mmio_init_queues(struct rt2x00_dev *rt2x00dev);
 int rt2800mmio_init_registers(struct rt2x00_dev *rt2x00dev);
 
+/* Device state switch handlers. */
+int rt2800mmio_enable_radio(struct rt2x00_dev *rt2x00dev);
+
 #endif /* RT2800MMIO_H */
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 88dd242ac1e3..77ddd1a97732 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -205,23 +205,10 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,
 
         return 0;
 }
-#endif /* CONFIG_PCI */
 
 /*
  * Device state switch handlers.
  */
-static int rt2800mmio_enable_radio(struct rt2x00_dev *rt2x00dev)
-{
-        /* Wait for DMA, ignore error until we initialize queues. */
-        rt2800_wait_wpdma_ready(rt2x00dev);
-
-        if (unlikely(rt2800mmio_init_queues(rt2x00dev)))
-                return -EIO;
-
-        return rt2800_enable_radio(rt2x00dev);
-}
-
-#ifdef CONFIG_PCI
 static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev)
 {
         int retval;