diff options
-rw-r--r-- | arch/unicore32/include/asm/pci.h | 5 | ||||
-rw-r--r-- | arch/unicore32/kernel/pci.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h index c5b28b459535..dd3867727c35 100644 --- a/arch/unicore32/include/asm/pci.h +++ b/arch/unicore32/include/asm/pci.h | |||
@@ -17,11 +17,6 @@ | |||
17 | #include <asm-generic/pci.h> | 17 | #include <asm-generic/pci.h> |
18 | #include <mach/hardware.h> /* for PCIBIOS_MIN_* */ | 18 | #include <mach/hardware.h> /* for PCIBIOS_MIN_* */ |
19 | 19 | ||
20 | static inline void pcibios_set_master(struct pci_dev *dev) | ||
21 | { | ||
22 | /* No special bus mastering setup handling */ | ||
23 | } | ||
24 | |||
25 | static inline void pcibios_penalize_isa_irq(int irq, int active) | 20 | static inline void pcibios_penalize_isa_irq(int irq, int active) |
26 | { | 21 | { |
27 | /* We don't do dynamic PCI IRQ allocation */ | 22 | /* We don't do dynamic PCI IRQ allocation */ |
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index 4892fbb54ebf..a8f07fe10cad 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c | |||
@@ -309,6 +309,11 @@ char * __devinit pcibios_setup(char *str) | |||
309 | return str; | 309 | return str; |
310 | } | 310 | } |
311 | 311 | ||
312 | void pcibios_set_master(struct pci_dev *dev) | ||
313 | { | ||
314 | /* No special bus mastering setup handling */ | ||
315 | } | ||
316 | |||
312 | /* | 317 | /* |
313 | * From arch/i386/kernel/pci-i386.c: | 318 | * From arch/i386/kernel/pci-i386.c: |
314 | * | 319 | * |