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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sh
/
boards
/
mpc1211
/
pci.c
diff --git
a/arch/sh/boards/mpc1211/pci.c
b/arch/sh/boards/mpc1211/pci.c
index
ba3a654
..
4ed1a95
100644
(file)
--- a/
arch/sh/boards/mpc1211/pci.c
+++ b/
arch/sh/boards/mpc1211/pci.c
@@
-11,7
+11,6
@@
* License. See linux/COPYING for more information.
*
*/
* License. See linux/COPYING for more information.
*
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-273,9
+272,9
@@
void __init pcibios_fixup_irqs(void)
}
void pcibios_align_resource(void *data, struct resource *res,
}
void pcibios_align_resource(void *data, struct resource *res,
-
unsigned long size, unsigned long
align)
+
resource_size_t size, resource_size_t
align)
{
{
-
unsigned long
start = res->start;
+
resource_size_t
start = res->start;
if (res->flags & IORESOURCE_IO) {
if (start >= 0x10000UL) {
if (res->flags & IORESOURCE_IO) {
if (start >= 0x10000UL) {