summaryrefslogtreecommitdiffstats
path: root/arch/h8300/include/asm/pci.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-20 01:02:01 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-20 01:02:01 +0100
commit10ce3cc919f50c2043b41ca968b43c26a3672600 (patch)
treeea409366a5208aced495bc0516a08b81fd43222e /arch/h8300/include/asm/pci.h
parentInput: wacom - fix physical size calculation for 3rd-gen Bamboo (diff)
parentInput: ili210x - add support for Ilitek ILI210x based touchscreens (diff)
downloadlinux-10ce3cc919f50c2043b41ca968b43c26a3672600.tar.xz
linux-10ce3cc919f50c2043b41ca968b43c26a3672600.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/h8300/include/asm/pci.h')
-rw-r--r--arch/h8300/include/asm/pci.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/h8300/include/asm/pci.h b/arch/h8300/include/asm/pci.h
index cc9762091c0a..0b2acaa3dd84 100644
--- a/arch/h8300/include/asm/pci.h
+++ b/arch/h8300/include/asm/pci.h
@@ -9,11 +9,6 @@
#define pcibios_assign_all_busses() 0
-static inline void pcibios_set_master(struct pci_dev *dev)
-{
- /* No special bus mastering setup handling */
-}
-
static inline void pcibios_penalize_isa_irq(int irq, int active)
{
/* We don't do dynamic PCI IRQ allocation */