git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for...
[pandora-kernel.git]
/
arch
/
microblaze
/
include
/
asm
/
pci.h
diff --git
a/arch/microblaze/include/asm/pci.h
b/arch/microblaze/include/asm/pci.h
index
2232ff9
..
ba65cf4
100644
(file)
--- a/
arch/microblaze/include/asm/pci.h
+++ b/
arch/microblaze/include/asm/pci.h
@@
-158,7
+158,7
@@
extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
extern void pcibios_setup_bus_devices(struct pci_bus *bus);
extern void pcibios_setup_bus_self(struct pci_bus *bus);
extern void pcibios_setup_bus_devices(struct pci_bus *bus);
extern void pcibios_setup_bus_self(struct pci_bus *bus);
-/* This part of code was originaly in xilinx-pci.h */
+/* This part of code was original
l
y in xilinx-pci.h */
#ifdef CONFIG_PCI_XILINX
extern void __init xilinx_pci_init(void);
#else
#ifdef CONFIG_PCI_XILINX
extern void __init xilinx_pci_init(void);
#else