diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-03 09:51:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-03 09:51:56 -0700 |
| commit | 400e9cf205dbf0e8aac1c7a5ab18129d41758184 (patch) | |
| tree | 42ba4a6e632dc648fddc2b10d0279b5eaea6e722 /include | |
| parent | 2006dfb7b601521c5573b4374b11b8497a1ab7ae (diff) | |
| parent | 6e1d6fb88e23718c57e465d6a6fe58b8e9cf7078 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_core.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 1ab6c1780230..1ad37531b7ad 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -205,7 +205,6 @@ struct uart_port { #define UPF_CONS_FLOW (1 << 23) #define UPF_SHARE_IRQ (1 << 24) #define UPF_BOOT_AUTOCONF (1 << 28) -#define UPF_RESOURCES (1 << 30) #define UPF_IOREMAP (1 << 31) #define UPF_CHANGE_MASK (0x17fff) |