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
/
m68knommu
/
kernel
/
comempci.c
diff --git
a/arch/m68knommu/kernel/comempci.c
b/arch/m68knommu/kernel/comempci.c
index
68aa14f
..
6ee00ef
100644
(file)
--- a/
arch/m68knommu/kernel/comempci.c
+++ b/
arch/m68knommu/kernel/comempci.c
@@
-9,7
+9,6
@@
/*****************************************************************************/
/*****************************************************************************/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/pci.h>
@@
-351,15
+350,14
@@
char *pcibios_setup(char *option)
}
/*****************************************************************************/
}
/*****************************************************************************/
-struct pci_fixup pcibios_fixups[] = { { 0 } };
-
void pcibios_fixup_bus(struct pci_bus *b)
{
}
/*****************************************************************************/
void pcibios_fixup_bus(struct pci_bus *b)
{
}
/*****************************************************************************/
-void pcibios_align_resource(void *data, struct resource *res, unsigned long size, unsigned long align)
+void pcibios_align_resource(void *data, struct resource *res,
+ resource_size_t size, resource_size_t align)
{
}
{
}
@@
-419,7
+417,7
@@
void pci_outw(unsigned short val, unsigned int addr)
volatile unsigned short *sp;
#ifdef DEBUGIO
volatile unsigned short *sp;
#ifdef DEBUGIO
- printk(KERN_DEBUG "pci_outw(val=%04x,addr=%x)", val, addr);
+ printk(KERN_DEBUG "pci_outw(val=%04x,addr=%x)
\n
", val, addr);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
#endif
rp = (volatile unsigned long *) COMEM_BASE;
@@
-470,7
+468,7
@@
unsigned char pci_inb(unsigned int addr)
unsigned char val;
#ifdef DEBUGIO
unsigned char val;
#ifdef DEBUGIO
- printk(KERN_DEBUG "pci_inb(addr=%x)", addr);
+ printk(KERN_DEBUG "pci_inb(addr=%x)
\n
", addr);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
#endif
rp = (volatile unsigned long *) COMEM_BASE;