Message ID | 200908202314.07443.PeterHuewe@gmx.de (mailing list archive) |
---|---|
State | Accepted, archived |
Commit | 948c28fe3001f2c9d852dff2a0b2c69fe7cec91b |
Delegated to: | Benjamin Herrenschmidt |
Headers | show |
Am Thursday 20 August 2009 23:14:06 schrieb Peter Hüwe: > From: Peter Huewe <peterhuewe@gmx.de> > > Trivial patch which adds the __init/__exit macros to the module_init/ > module_exit functions of char/hvc_vio.c > > Please have a look at the small patch and either pull it through > your tree, or please ack' it so Jiri can pull it through the trivial tree. > > linux version 2.6.31-rc6 - linus git tree, Do 20. Aug 22:26:06 CEST 2009 > > Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Hi Jiri, this one got merged by Benjamin, so you can drop it from your queue :) http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=948c28fe3001f2c9d852dff2a0b2c69fe7cec91b @Benjamin: Thanks for merging. Regards, Peter
On Thu, 17 Sep 2009, Peter Huewe wrote: > > Please have a look at the small patch and either pull it through > > your tree, or please ack' it so Jiri can pull it through the trivial tree. > > > > linux version 2.6.31-rc6 - linus git tree, Do 20. Aug 22:26:06 CEST 2009 > > > > Signed-off-by: Peter Huewe <peterhuewe@gmx.de> > > Hi Jiri, > this one got merged by Benjamin, so you can drop it from your queue :) > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=948c28fe3001f2c9d852dff2a0b2c69fe7cec91b Dropped, thanks for letting me know.
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c index c72b994..10be343 100644 --- a/drivers/char/hvc_vio.c +++ b/drivers/char/hvc_vio.c @@ -120,7 +120,7 @@ static struct vio_driver hvc_vio_driver = { } }; -static int hvc_vio_init(void) +static int __init hvc_vio_init(void) { int rc; @@ -134,7 +134,7 @@ static int hvc_vio_init(void) } module_init(hvc_vio_init); /* after drivers/char/hvc_console.c */ -static void hvc_vio_exit(void) +static void __exit hvc_vio_exit(void) { vio_unregister_driver(&hvc_vio_driver); }