diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
| commit | 84860bf0644d7c45afe7ddbd30731c3e3c371fae (patch) | |
| tree | d6c4b98a9c3fd9981e7fcc5d7729c9e01e327767 /drivers/base/init.c | |
| parent | 8caf89157d64f1eedba37113afb4b303b2b3e301 (diff) | |
| parent | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/base/init.c')
| -rw-r--r-- | drivers/base/init.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/base/init.c b/drivers/base/init.c index a76ae5a221f3..84e604e25c4f 100644 --- a/drivers/base/init.c +++ b/drivers/base/init.c | |||
| @@ -10,14 +10,8 @@ | |||
| 10 | #include <linux/device.h> | 10 | #include <linux/device.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | 12 | ||
| 13 | extern int devices_init(void); | 13 | #include "base.h" |
| 14 | extern int buses_init(void); | 14 | |
| 15 | extern int classes_init(void); | ||
| 16 | extern int firmware_init(void); | ||
| 17 | extern int platform_bus_init(void); | ||
| 18 | extern int system_bus_init(void); | ||
| 19 | extern int cpu_dev_init(void); | ||
| 20 | extern int attribute_container_init(void); | ||
| 21 | /** | 15 | /** |
| 22 | * driver_init - initialize driver model. | 16 | * driver_init - initialize driver model. |
| 23 | * | 17 | * |