summaryrefslogtreecommitdiff
path: root/arch/parisc/include/asm/hardware.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/parisc/include/asm/hardware.h')
-rw-r--r--arch/parisc/include/asm/hardware.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/hardware.h b/arch/parisc/include/asm/hardware.h
index d6e1ed145031..9d3d7737c58b 100644
--- a/arch/parisc/include/asm/hardware.h
+++ b/arch/parisc/include/asm/hardware.h
@@ -120,7 +120,7 @@ extern void get_pci_node_path(struct pci_dev *dev, struct hardware_path *path);
extern void init_parisc_bus(void);
extern struct device *hwpath_to_device(struct hardware_path *modpath);
extern void device_to_hwpath(struct device *dev, struct hardware_path *path);
-
+extern int machine_has_merced_bus(void);
/* inventory.c: */
extern void do_memory_inventory(void);