diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/input/keyboard/lkkbd.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/input/keyboard/lkkbd.c')
| -rw-r--r-- | drivers/input/keyboard/lkkbd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c index 708d5a1bc3d2..979b93e33da7 100644 --- a/drivers/input/keyboard/lkkbd.c +++ b/drivers/input/keyboard/lkkbd.c | |||
| @@ -59,11 +59,6 @@ | |||
| 59 | * You should have received a copy of the GNU General Public License | 59 | * You should have received a copy of the GNU General Public License |
| 60 | * along with this program; if not, write to the Free Software | 60 | * along with this program; if not, write to the Free Software |
| 61 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 61 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 62 | * | ||
| 63 | * Should you need to contact me, the author, you can do so either by | ||
| 64 | * email or by paper mail: | ||
| 65 | * Jan-Benedict Glaw, Lilienstraße 16, 33790 Hörste (near Halle/Westf.), | ||
| 66 | * Germany. | ||
| 67 | */ | 62 | */ |
| 68 | 63 | ||
| 69 | #include <linux/delay.h> | 64 | #include <linux/delay.h> |