diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 05:05:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 05:05:01 -0800 |
| commit | acf3fabb73c1a584b3c0ecabed1a51227c8eb33b (patch) | |
| tree | 2510acfeffe44db886cb7240bf8f207a097b7399 /include/linux | |
| parent | 1893f0e56ad101fb1c17fcb3cbebc32e7befd38e (diff) | |
| parent | b965eeb8aa0104efb0a41e03b351c03d1b635067 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serialP.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/serialP.h b/include/linux/serialP.h index 6b92d29979ca..93f7492edaac 100644 --- a/include/linux/serialP.h +++ b/include/linux/serialP.h @@ -26,11 +26,6 @@ #include <linux/interrupt.h> #include <linux/circ_buf.h> #include <linux/wait.h> -#if (LINUX_VERSION_CODE < 0x020300) -/* Unfortunate, but Linux 2.2 needs async_icount defined here and - * it got moved in 2.3 */ -#include <linux/serial.h> -#endif struct serial_state { int magic; |