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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
ide
/
setup-pci.c
diff --git
a/drivers/ide/setup-pci.c
b/drivers/ide/setup-pci.c
index
462ed30
..
eb09452
100644
(file)
--- a/
drivers/ide/setup-pci.c
+++ b/
drivers/ide/setup-pci.c
@@
-18,7
+18,6
@@
* configuration of all PCI IDE interfaces present in a system.
*/
* configuration of all PCI IDE interfaces present in a system.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@
-694,13
+693,8
@@
static int do_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d,
goto out;
}
if (noisy)
goto out;
}
if (noisy)
-#ifdef __sparc__
- printk(KERN_INFO "%s: 100%% native mode on irq %s\n",
- d->name, __irq_itoa(pciirq));
-#else
printk(KERN_INFO "%s: 100%% native mode on irq %d\n",
d->name, pciirq);
printk(KERN_INFO "%s: 100%% native mode on irq %d\n",
d->name, pciirq);
-#endif
}
/* FIXME: silent failure can happen */
}
/* FIXME: silent failure can happen */