aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlabel/netlabel_domainhash.c
diff options
context:
space:
mode:
authorLachlan McIlroy <[email protected]>2008-02-26 03:26:14 +0000
committerLachlan McIlroy <[email protected]>2008-02-26 03:26:14 +0000
commit91e229bbad6524aabaac8717b2f559283670c37a (patch)
tree84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /net/netlabel/netlabel_domainhash.c
parentRemove empty file fs/xfs/Makefile-linux-2.6. (diff)
parentLinux 2.6.25-rc3 (diff)
downloadkernel-91e229bbad6524aabaac8717b2f559283670c37a.tar.gz
kernel-91e229bbad6524aabaac8717b2f559283670c37a.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'net/netlabel/netlabel_domainhash.c')
-rw-r--r--net/netlabel/netlabel_domainhash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
index fd462313471c..02c2f7c0b255 100644
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -171,7 +171,7 @@ static struct netlbl_dom_map *netlbl_domhsh_search_def(const char *domain)
* values on error.
*
*/
-int netlbl_domhsh_init(u32 size)
+int __init netlbl_domhsh_init(u32 size)
{
u32 iter;
struct netlbl_domhsh_tbl *hsh_tbl;