From 90500a9d1a9fbb8a4239d14452ad947fb562884a Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Tue, 12 Jan 1999 10:35:58 +0000
Subject: [PATCH] Clean up warnings: get conditional compilation right so that
 a local function won't be defined unless it is actually used. Requested by:
 eivind

---
 sys/dev/fb/fb.c   | 17 +++++++++++------
 sys/dev/kbd/kbd.c | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index e765bc2ab93a..faa9c2040640 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: $
+ * $Id: fb.c,v 1.1 1999/01/09 02:44:49 yokota Exp $
  */
 
 #include "fb.h"
@@ -48,17 +48,20 @@
  * for the kernel console.  The arrays will be increased dynamically
  * when necessary.
  */
-static video_adapter_t	*adp_ini;
-static video_switch_t	*vidsw_ini;
-static struct cdevsw	*vidcdevsw_ini;
 
-static video_adapter_t	**adapter = &adp_ini;
 static int		adapters = 1;
+static video_adapter_t	*adp_ini;
+static video_adapter_t	**adapter = &adp_ini;
+static video_switch_t	*vidsw_ini;
        video_switch_t	**vidsw = &vidsw_ini;
-static struct cdevsw	**vidcdevsw = &vidcdevsw_ini;
+
+#ifdef FB_INSTALL_CDEV
 
 #define ARRAY_DELTA	4
 
+static struct cdevsw	*vidcdevsw_ini;
+static struct cdevsw	**vidcdevsw = &vidcdevsw_ini;
+
 static void
 vid_realloc_array(void)
 {
@@ -94,6 +97,8 @@ vid_realloc_array(void)
 		printf("fb: new array size %d\n", adapters);
 }
 
+#endif /* FB_INSTALL_CDEV */
+
 /*
  * Low-level frame buffer driver functions
  * frame buffer subdrivers, such as the VGA driver, call these functions
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 7fac7091921b..ee4ade1adf6b 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: $
+ * $Id: kbd.c,v 1.1 1999/01/09 02:44:50 yokota Exp $
  */
 
 #include "kbd.h"
@@ -51,17 +51,20 @@
  * for the kernel console.  The arrays will be increased dynamically
  * when necessary.
  */
-static keyboard_t	*kbd_ini;
-static keyboard_switch_t *kbdsw_ini;
-static struct cdevsw	*kbdcdevsw_ini;
 
-static keyboard_t	**keyboard = &kbd_ini;
 static int		keyboards = 1;
+static keyboard_t	*kbd_ini;
+static keyboard_t	**keyboard = &kbd_ini;
+static keyboard_switch_t *kbdsw_ini;
        keyboard_switch_t **kbdsw = &kbdsw_ini;
-static struct cdevsw	**kbdcdevsw = &kbdcdevsw_ini;
+
+#ifdef KBD_INSTALL_CDEV
 
 #define ARRAY_DELTA	4
 
+static struct cdevsw	*kbdcdevsw_ini;
+static struct cdevsw	**kbdcdevsw = &kbdcdevsw_ini;
+
 static void
 kbd_realloc_array(void)
 {
@@ -97,6 +100,8 @@ kbd_realloc_array(void)
 		printf("kbd: new array size %d\n", keyboards);
 }
 
+#endif /* KBD_INSTALL_CDEV */
+
 /*
  * Low-level keyboard driver functions
  * Keyboard subdrivers, such as the AT keyboard driver and the USB keyboard