aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-19 16:01:28 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-20 13:56:45 -0500
commit1f21782e63da81f56401a813a52091ef2703838f (patch)
tree8a01f16d84fe3ec10182d4f8b987f1c7beecd414 /include/linux
parent542cfce6f36e8c43f71ae9c235b78497f350ae55 (diff)
Driver core: proper prototype for drivers/base/init.c:driver_init()
Add a prototype for driver_init() in include/linux/device.h. Also remove a static function of the same name in drivers/acpi/ibm_acpi.c to ibm_acpi_driver_init() to fix the namespace collision. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 49ab53ce92dc..f44247fe8135 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -433,6 +433,8 @@ static inline int device_is_registered(struct device *dev)
433 return dev->is_registered; 433 return dev->is_registered;
434} 434}
435 435
436void driver_init(void);
437
436/* 438/*
437 * High level routines for use by the bus drivers 439 * High level routines for use by the bus drivers
438 */ 440 */