aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/misc/yealink.c2
-rw-r--r--include/linux/Kbuild1
-rw-r--r--include/linux/map_to_7segment.h (renamed from drivers/input/misc/map_to_7segment.h)4
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index facefd3dba29..11b5c7e84ed1 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -52,8 +52,8 @@
52#include <linux/module.h> 52#include <linux/module.h>
53#include <linux/rwsem.h> 53#include <linux/rwsem.h>
54#include <linux/usb/input.h> 54#include <linux/usb/input.h>
55#include <linux/map_to_7segment.h>
55 56
56#include "map_to_7segment.h"
57#include "yealink.h" 57#include "yealink.h"
58 58
59#define DRIVER_VERSION "yld-20051230" 59#define DRIVER_VERSION "yld-20051230"
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 4c4142c5aa6e..0b136c5990cc 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -106,6 +106,7 @@ header-y += keyctl.h
106header-y += limits.h 106header-y += limits.h
107header-y += magic.h 107header-y += magic.h
108header-y += major.h 108header-y += major.h
109header-y += map_to_7segment.h
109header-y += matroxfb.h 110header-y += matroxfb.h
110header-y += meye.h 111header-y += meye.h
111header-y += minix_fs.h 112header-y += minix_fs.h
diff --git a/drivers/input/misc/map_to_7segment.h b/include/linux/map_to_7segment.h
index a424094d9fe2..7df8432c4402 100644
--- a/drivers/input/misc/map_to_7segment.h
+++ b/include/linux/map_to_7segment.h
@@ -1,6 +1,4 @@
1/* 1/*
2 * drivers/usb/input/map_to_7segment.h
3 *
4 * Copyright (c) 2005 Henk Vergonet <Henk.Vergonet@gmail.com> 2 * Copyright (c) 2005 Henk Vergonet <Henk.Vergonet@gmail.com>
5 * 3 *
6 * This program is free software; you can redistribute it and/or 4 * This program is free software; you can redistribute it and/or
@@ -36,7 +34,7 @@
36 * Usage: 34 * Usage:
37 * 35 *
38 * Register a map variable, and fill it with a character set: 36 * Register a map variable, and fill it with a character set:
39 * static SEG7_DEFAULT_MAP(map_seg7); 37 * static SEG7_DEFAULT_MAP(map_seg7);
40 * 38 *
41 * 39 *
42 * Then use for conversion: 40 * Then use for conversion: