From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
linux-kernel@vger.kernel.org, ibm-acpi@hmh.eng.br,
len.brown@intel.com, linux-acpi@vger.kernel.org,
Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Subject: [2.6 patch] proper prototype for drivers/base/init.c:driver_init()
Date: Tue, 12 Dec 2006 17:22:35 +0100 [thread overview]
Message-ID: <20061212162235.GQ28443@stusta.de> (raw)
This patch adds a prototype for driver_init() in include/linux/device.h.
It also removes 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>
---
drivers/acpi/ibm_acpi.c | 4 ++--
include/linux/device.h | 2 ++
init/main.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
--- linux-2.6.19-rc6-mm1/include/linux/device.h.old 2006-11-25 00:03:22.000000000 +0100
+++ linux-2.6.19-rc6-mm1/include/linux/device.h 2006-11-25 00:04:06.000000000 +0100
@@ -432,6 +432,8 @@
return dev->is_registered;
}
+void driver_init(void);
+
/*
* High level routines for use by the bus drivers
*/
--- linux-2.6.19-rc6-mm1/init/main.c.old 2006-11-25 00:05:03.000000000 +0100
+++ linux-2.6.19-rc6-mm1/init/main.c 2006-11-25 00:05:58.000000000 +0100
@@ -52,8 +52,9 @@
#include <linux/debug_locks.h>
#include <linux/lockdep.h>
#include <linux/utsrelease.h>
#include <linux/pid_namespace.h>
#include <linux/compile.h>
+#include <linux/device.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@ -90,7 +91,6 @@
extern void radix_tree_init(void);
extern void free_initmem(void);
extern void populate_rootfs(void);
-extern void driver_init(void);
extern void prepare_namespace(void);
#ifdef CONFIG_ACPI
extern void acpi_early_init(void);
--- linux-2.6.19-rc6-mm1/drivers/acpi/ibm_acpi.c.old 2006-11-25 00:06:12.000000000 +0100
+++ linux-2.6.19-rc6-mm1/drivers/acpi/ibm_acpi.c 2006-11-25 00:06:37.000000000 +0100
@@ -355,7 +355,7 @@
return start;
}
-static int driver_init(void)
+static int ibm_acpi_driver_init(void)
{
printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);
printk(IBM_INFO "%s\n", IBM_URL);
@@ -1634,7 +1634,7 @@
static struct ibm_struct ibms[] = {
{
.name = "driver",
- .init = driver_init,
+ .init = ibm_acpi_driver_init,
.read = driver_read,
},
{
next reply other threads:[~2006-12-12 16:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-12 16:22 Adrian Bunk [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-11-25 19:16 [2.6 patch] proper prototype for drivers/base/init.c:driver_init() Adrian Bunk
2006-11-25 21:40 ` Henrique de Moraes Holschuh
2006-11-25 22:31 ` Henrique de Moraes Holschuh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061212162235.GQ28443@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=gregkh@suse.de \
--cc=hmh@hmh.eng.br \
--cc=ibm-acpi@hmh.eng.br \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.