Module Name: src
Committed By: pooka
Date: Fri Jan 8 00:27:48 UTC 2010
Modified Files:
src/sys/dev/dm: device-mapper.c
Log Message:
Fix this for non-module (which, i guess, is only i386/ALL).
XXX: autoconfusion vs. modules is an intolerable mess of stepping
on each others' toes.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/dm/device-mapper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.14 src/sys/dev/dm/device-mapper.c:1.15
--- src/sys/dev/dm/device-mapper.c:1.14 Sun Jan 3 22:55:25 2010
+++ src/sys/dev/dm/device-mapper.c Fri Jan 8 00:27:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.14 2010/01/03 22:55:25 haad Exp $ */
+/* $NetBSD: device-mapper.c,v 1.15 2010/01/08 00:27:48 pooka Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,8 +59,8 @@
static dev_type_size(dmsize);
/* attach and detach routines */
-static int dmattach(void);
-static int dmdestroy(void);
+int dmattach(void);
+int dmdestroy(void);
static int dm_cmd_to_fun(prop_dictionary_t);
static int disk_ioctl_switch(dev_t, u_long, void *);
@@ -101,8 +101,11 @@
.d_strategy = dmstrategy
};
+#ifdef _MODULE
/* Autoconf defines */
CFDRIVER_DECL(dm, DV_DISK, NULL);
+#endif
+
CFATTACH_DECL3_NEW(dm, 0,
dm_match, dm_attach, dm_detach, NULL, NULL, NULL,
DVF_DETACH_SHUTDOWN);
@@ -273,7 +276,7 @@
}
/* attach routine */
-static int
+int
dmattach(void)
{
@@ -285,7 +288,7 @@
}
/* Destroy routine */
-static int
+int
dmdestroy(void)
{
