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]
/
arch
/
sh
/
boards
/
overdrive
/
galileo.c
diff --git
a/arch/sh/boards/overdrive/galileo.c
b/arch/sh/boards/overdrive/galileo.c
index
54020eb
..
29e4897
100644
(file)
--- a/
arch/sh/boards/overdrive/galileo.c
+++ b/
arch/sh/boards/overdrive/galileo.c
@@
-9,7
+9,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/kernel.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
@@
-455,13
+454,7
@@
static void __init pci_fixup_ide_bases(struct pci_dev *d)
}
}
}
}
}
}
-
-
-/* Add future fixups here... */
-struct pci_fixup pcibios_fixups[] = {
- { PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases },
- { 0 }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
void __init pcibios_init(void)
{
void __init pcibios_init(void)
{
@@
-542,7
+535,7
@@
void __init pcibios_fixup_bus(struct pci_bus *bus)
}
void pcibios_align_resource(void *data, struct resource *res,
}
void pcibios_align_resource(void *data, struct resource *res,
-
unsigned long
size)
+
resource_size_t
size)
{
}
{
}