diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-01-07 22:31:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-01-07 22:31:09 -0800 |
| commit | 2986373c912bfb767ae5cfbf7f7434b128d2beeb (patch) | |
| tree | 060a3ae8fd142c6331a87ef13b360c84add14d45 | |
| parent | 5e304841d6035f9ba78b3a18e97c6844071568be (diff) | |
[PATCH] prism54: small prismcompat cleanup
- the FW_LOADER is already guaranteed through the Kconfig file
- prism54_synchronize_irq is also #define'd to synchronize_irq
in prismcompat24.h, so there's no need for it
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/net/wireless/prism54/islpci_dev.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/prism54/prismcompat.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 1ae168527c74..f5fc41972f17 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c @@ -419,7 +419,7 @@ prism54_bring_down(islpci_private *priv) * currently in progress by emptying the TX and RX queues. */ /* wait until interrupts have finished executing on other CPUs */ - prism54_synchronize_irq(priv->pdev->irq); + synchronize_irq(priv->pdev->irq); reg = readl(device_base + ISL38XX_CTRL_STAT_REG); reg &= ~(ISL38XX_CTRL_STAT_RESET | ISL38XX_CTRL_STAT_RAMBOOT); diff --git a/drivers/net/wireless/prism54/prismcompat.h b/drivers/net/wireless/prism54/prismcompat.h index a644eb40ffca..55541c01752e 100644 --- a/drivers/net/wireless/prism54/prismcompat.h +++ b/drivers/net/wireless/prism54/prismcompat.h @@ -34,16 +34,10 @@ #include <linux/workqueue.h> #include <linux/compiler.h> -#if !defined(CONFIG_FW_LOADER) && !defined(CONFIG_FW_LOADER_MODULE) -#error Firmware Loading is not configured in the kernel ! -#endif - #ifndef __iomem #define __iomem #endif -#define prism54_synchronize_irq(irq) synchronize_irq(irq) - #define PRISM_FW_PDEV &priv->pdev->dev #endif /* _PRISM_COMPAT_H */ |