diff options
author | Samuel Ortiz <samuel@sortiz.org> | 2007-07-18 02:16:30 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-07-18 02:16:30 -0700 |
commit | 75a69ac6d66d2504ecbc4b46645fb0835a55a57c (patch) | |
tree | df2b3ee737b93f7cc6fe517d565cca1d579c2533 /net/irda/irproc.c | |
parent | 83ca46e7ac7b2883ae7d02503a01e8f1578afe4e (diff) | |
download | op-kernel-dev-75a69ac6d66d2504ecbc4b46645fb0835a55a57c.zip op-kernel-dev-75a69ac6d66d2504ecbc4b46645fb0835a55a57c.tar.gz |
[IrDA]: Fix IrDA build failure
When having built-in IrDA, we hit the following error:
`irda_sysctl_unregister' referenced in section `.init.text' of
net/built-in.o: defined in discarded section `.exit.text' of
net/built-in.o
`irda_proc_unregister' referenced in section `.init.text' of
net/built-in.o: defined in discarded section `.exit.text' of
net/built-in.o
`irsock_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
`irttp_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
`iriap_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
`irda_device_cleanup' referenced in section `.init.text' of
net/built-in.o: defined in discarded section `.exit.text' of
net/built-in.o
`irlap_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
`irlmp_cleanup' referenced in section `.init.text' of net/built-in.o:
defined in discarded section `.exit.text' of net/built-in.o
make[1]: *** [.tmp_vmlinux1] Error 1
make: *** [_all] Error 2
This is due to the irda_init fix recently added, where we call __exit
routines from an __init one. It is a build failure that I didn't catch
because it doesn't show up when building IrDA as a module. My apologies
for that.
The following patch fixes that failure and is against your net-2.6
tree. I hope it can make it to the merge window, and stable@kernel.org
is CCed on this mail.
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/irproc.c')
-rw-r--r-- | net/irda/irproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irproc.c b/net/irda/irproc.c index d6f9aba..181cb51 100644 --- a/net/irda/irproc.c +++ b/net/irda/irproc.c @@ -84,7 +84,7 @@ void __init irda_proc_register(void) * Unregister irda entry in /proc file system * */ -void __exit irda_proc_unregister(void) +void irda_proc_unregister(void) { int i; |