From 7d4d0174f37d90a0c10d039868d5e76c30de10f4 Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@tiscali.nl>
Date: Fri, 8 Jun 2012 11:37:00 +0200
Subject: [PATCH] --- yaml --- r: 325559 b: refs/heads/master c:
 4a055c9c9e1b9c6ea677a3f8187e70339ff47358 h: refs/heads/master i:   325557:
 c5bfdcbff692a76a556293bfdec96d1da56b3db8   325555:
 986704f3489ba1731547fcac98e922a1ce48f2e9   325551:
 0e0f7dd0a5ad6b34aebd3952d08f498aa52bb1a7 v: v3

---
 [refs]                               |  2 +-
 trunk/include/linux/Kbuild           |  1 -
 trunk/include/linux/generic_serial.h | 35 ----------------------------
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 trunk/include/linux/generic_serial.h

diff --git a/[refs] b/[refs]
index 20b40ec92fc5..68b811711dbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afbaade3dc99838a0c39699bea175674f27322a1
+refs/heads/master: 4a055c9c9e1b9c6ea677a3f8187e70339ff47358
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 0a8bcb6b9e2f..cf41085e3331 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -138,7 +138,6 @@ header-y += fuse.h
 header-y += futex.h
 header-y += gameport.h
 header-y += gen_stats.h
-header-y += generic_serial.h
 header-y += genetlink.h
 header-y += gfs2_ondisk.h
 header-y += gigaset_dev.h
diff --git a/trunk/include/linux/generic_serial.h b/trunk/include/linux/generic_serial.h
deleted file mode 100644
index 79b3eb37243a..000000000000
--- a/trunk/include/linux/generic_serial.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  generic_serial.h
- *
- *  Copyright (C) 1998 R.E.Wolff@BitWizard.nl
- *
- *  written for the SX serial driver.
- *
- *  Version 0.1 -- December, 1998.
- */
-
-#ifndef GENERIC_SERIAL_H
-#define GENERIC_SERIAL_H
-
-#warning Use of this header is deprecated.
-#warning Since nobody sets the constants defined here for you, you should not, in any case, use them. Including the header is thus pointless.
-
-/* Flags */
-/* Warning: serial.h defines some ASYNC_ flags, they say they are "only"
-   used in serial.c, but they are also used in all other serial drivers. 
-   Make sure they don't clash with these here... */
-#define GS_TX_INTEN      0x00800000
-#define GS_RX_INTEN      0x00400000
-#define GS_ACTIVE        0x00200000
-
-#define GS_TYPE_NORMAL   1
-
-#define GS_DEBUG_FLUSH   0x00000001
-#define GS_DEBUG_BTR     0x00000002
-#define GS_DEBUG_TERMIOS 0x00000004
-#define GS_DEBUG_STUFF   0x00000008
-#define GS_DEBUG_CLOSE   0x00000010
-#define GS_DEBUG_FLOW    0x00000020
-#define GS_DEBUG_WRITE   0x00000040
-
-#endif