From 22ab9a929f107ef783e4514da8094edb85157ff6 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Thu, 13 Oct 2005 17:54:41 +0100 Subject: [PATCH] --- yaml --- r: 10577 b: refs/heads/master c: a1bdc7aad8b557176ccecff1da137ebe3090871e h: refs/heads/master i: 10575: 132fa6fe3512cd5276340bc96b0a1eddf000c195 v: v3 --- [refs] | 2 +- trunk/drivers/base/attribute_container.c | 2 ++ trunk/drivers/base/base.h | 12 ++++++++++++ trunk/drivers/base/cpu.c | 1 + trunk/drivers/base/firmware.c | 3 +++ trunk/drivers/base/init.c | 10 ++-------- trunk/drivers/base/platform.c | 2 ++ 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 9b23c77a3d14..35e24e6773c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7fadbe10ccf430e7a8add8b45c561d864087343 +refs/heads/master: a1bdc7aad8b557176ccecff1da137ebe3090871e diff --git a/trunk/drivers/base/attribute_container.c b/trunk/drivers/base/attribute_container.c index 6b2eb6f39b4d..2a7d7ae83e1e 100644 --- a/trunk/drivers/base/attribute_container.c +++ b/trunk/drivers/base/attribute_container.c @@ -19,6 +19,8 @@ #include #include +#include "base.h" + /* This is a private structure used to tie the classdev and the * container .. it should never be visible outside this file */ struct internal_container { diff --git a/trunk/drivers/base/base.h b/trunk/drivers/base/base.h index 783752b68a9a..e3b548d46cff 100644 --- a/trunk/drivers/base/base.h +++ b/trunk/drivers/base/base.h @@ -1,3 +1,15 @@ + +/* initialisation functions */ + +extern int devices_init(void); +extern int buses_init(void); +extern int classes_init(void); +extern int firmware_init(void); +extern int platform_bus_init(void); +extern int system_bus_init(void); +extern int cpu_dev_init(void); +extern int attribute_container_init(void); + extern int bus_add_device(struct device * dev); extern void bus_remove_device(struct device * dev); diff --git a/trunk/drivers/base/cpu.c b/trunk/drivers/base/cpu.c index b79badd0f158..081c927b1ed8 100644 --- a/trunk/drivers/base/cpu.c +++ b/trunk/drivers/base/cpu.c @@ -9,6 +9,7 @@ #include #include +#include "base.h" struct sysdev_class cpu_sysdev_class = { set_kset_name("cpu"), diff --git a/trunk/drivers/base/firmware.c b/trunk/drivers/base/firmware.c index 88ab044932f2..cb1b98ae0d58 100644 --- a/trunk/drivers/base/firmware.c +++ b/trunk/drivers/base/firmware.c @@ -11,6 +11,9 @@ #include #include #include +#include + +#include "base.h" static decl_subsys(firmware, NULL, NULL); diff --git a/trunk/drivers/base/init.c b/trunk/drivers/base/init.c index a76ae5a221f3..84e604e25c4f 100644 --- a/trunk/drivers/base/init.c +++ b/trunk/drivers/base/init.c @@ -10,14 +10,8 @@ #include #include -extern int devices_init(void); -extern int buses_init(void); -extern int classes_init(void); -extern int firmware_init(void); -extern int platform_bus_init(void); -extern int system_bus_init(void); -extern int cpu_dev_init(void); -extern int attribute_container_init(void); +#include "base.h" + /** * driver_init - initialize driver model. * diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c index 361e204209eb..a1a56ff65b76 100644 --- a/trunk/drivers/base/platform.c +++ b/trunk/drivers/base/platform.c @@ -17,6 +17,8 @@ #include #include +#include "base.h" + struct device platform_bus = { .bus_id = "platform", };