diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
| commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
| tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/base/init.c | |
| parent | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (diff) | |
| parent | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (diff) | |
Merge branch 'upstream'
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 | * |