[src/trunk]: src/sys/dev/dm Fix this for non-module (which, i guess, is only ...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ccf9f1eb362f
branches:  trunk
changeset: 750606:ccf9f1eb362f
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jan 08 00:27:48 2010 +0000

description:
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.

diffstat:

 sys/dev/dm/device-mapper.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r d7f0ef2f1d0e -r ccf9f1eb362f sys/dev/dm/device-mapper.c
--- a/sys/dev/dm/device-mapper.c        Fri Jan 08 00:09:44 2010 +0000
+++ b/sys/dev/dm/device-mapper.c        Fri Jan 08 00:27:48 2010 +0000
@@ -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)
 {