git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
mmc
/
wbsd.c
diff --git
a/drivers/mmc/wbsd.c
b/drivers/mmc/wbsd.c
index
c351c6d
..
8167332
100644
(file)
--- a/
drivers/mmc/wbsd.c
+++ b/
drivers/mmc/wbsd.c
@@
-21,6
+21,7
@@
* - On APIC systems the FIFO empty interrupt is sometimes lost.
*/
* - On APIC systems the FIFO empty interrupt is sometimes lost.
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
@@
-41,7
+42,7
@@
#include "wbsd.h"
#define DRIVER_NAME "wbsd"
#include "wbsd.h"
#define DRIVER_NAME "wbsd"
-#define DRIVER_VERSION "1.
6
"
+#define DRIVER_VERSION "1.
5
"
#define DBG(x...) \
pr_debug(DRIVER_NAME ": " x)
#define DBG(x...) \
pr_debug(DRIVER_NAME ": " x)
@@
-1439,13
+1440,13
@@
static int __devinit wbsd_scan(struct wbsd_host *host)
static int __devinit wbsd_request_region(struct wbsd_host *host, int base)
{
static int __devinit wbsd_request_region(struct wbsd_host *host, int base)
{
- if (
base
& 0x7)
+ if (
io
& 0x7)
return -EINVAL;
if (!request_region(base, 8, DRIVER_NAME))
return -EIO;
return -EINVAL;
if (!request_region(base, 8, DRIVER_NAME))
return -EIO;
- host->base =
base
;
+ host->base =
io
;
return 0;
}
return 0;
}
@@
-1553,7
+1554,7
@@
static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq)
* Allocate interrupt.
*/
* Allocate interrupt.
*/
- ret = request_irq(irq, wbsd_irq,
IRQF_SHARED
, DRIVER_NAME, host);
+ ret = request_irq(irq, wbsd_irq,
SA_SHIRQ
, DRIVER_NAME, host);
if (ret)
return ret;
if (ret)
return ret;
@@
-1773,7
+1774,7
@@
static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
/*
* Request resources.
*/
/*
* Request resources.
*/
- ret = wbsd_request_resources(host,
base
, irq, dma);
+ ret = wbsd_request_resources(host,
io
, irq, dma);
if (ret) {
wbsd_release_resources(host);
wbsd_free_mmc(dev);
if (ret) {
wbsd_release_resources(host);
wbsd_free_mmc(dev);
@@
-1861,7
+1862,6
@@
static void __devexit wbsd_shutdown(struct device *dev, int pnp)
static int __devinit wbsd_probe(struct platform_device *dev)
{
static int __devinit wbsd_probe(struct platform_device *dev)
{
- /* Use the module parameters for resources */
return wbsd_init(&dev->dev, io, irq, dma, 0);
}
return wbsd_init(&dev->dev, io, irq, dma, 0);
}