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
/
mmci.c
diff --git
a/drivers/mmc/mmci.c
b/drivers/mmc/mmci.c
index
1886562
..
da8e4d7
100644
(file)
--- a/
drivers/mmc/mmci.c
+++ b/
drivers/mmc/mmci.c
@@
-7,6
+7,7
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#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>
@@
-531,11
+532,11
@@
static int mmci_probe(struct amba_device *dev, void *id)
writel(0, host->base + MMCIMASK1);
writel(0xfff, host->base + MMCICLEAR);
writel(0, host->base + MMCIMASK1);
writel(0xfff, host->base + MMCICLEAR);
- ret = request_irq(dev->irq[0], mmci_irq,
IRQF_SHARED
, DRIVER_NAME " (cmd)", host);
+ ret = request_irq(dev->irq[0], mmci_irq,
SA_SHIRQ
, DRIVER_NAME " (cmd)", host);
if (ret)
goto unmap;
if (ret)
goto unmap;
- ret = request_irq(dev->irq[1], mmci_pio_irq,
IRQF_SHARED
, DRIVER_NAME " (pio)", host);
+ ret = request_irq(dev->irq[1], mmci_pio_irq,
SA_SHIRQ
, DRIVER_NAME " (pio)", host);
if (ret)
goto irq0_free;
if (ret)
goto irq0_free;
@@
-545,9
+546,9
@@
static int mmci_probe(struct amba_device *dev, void *id)
mmc_add_host(mmc);
mmc_add_host(mmc);
- printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%0
16l
lx irq %d,%d\n",
+ printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%0
8
lx irq %d,%d\n",
mmc_hostname(mmc), amba_rev(dev), amba_config(dev),
mmc_hostname(mmc), amba_rev(dev), amba_config(dev),
-
(unsigned long long)
dev->res.start, dev->irq[0], dev->irq[1]);
+ dev->res.start, dev->irq[0], dev->irq[1]);
init_timer(&host->timer);
host->timer.data = (unsigned long)host;
init_timer(&host->timer);
host->timer.data = (unsigned long)host;