summaryrefslogtreecommitdiff
path: root/arch/microblaze/include/asm/pci.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-02 12:41:40 +0400
committerTakashi Iwai <tiwai@suse.de>2011-05-02 12:41:40 +0400
commita3ea8e8f2474c35b4c3e22262991afddb93c4c0e (patch)
tree648bbeea304950d02e71863673be8154a5e491f6 /arch/microblaze/include/asm/pci.h
parentc2de187e5b0f25b572ac1cb6cdf383f16123717d (diff)
parentebb47241ea0eac6a5a23404821a2d62f64c68496 (diff)
downloadlinux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.xz
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'arch/microblaze/include/asm/pci.h')
-rw-r--r--arch/microblaze/include/asm/pci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 2232ff942ba9..ba65cf472544 100644
--- 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);
-/* This part of code was originaly in xilinx-pci.h */
+/* This part of code was originally in xilinx-pci.h */
#ifdef CONFIG_PCI_XILINX
extern void __init xilinx_pci_init(void);
#else