diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2003-10-29 08:32:00 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2003-10-29 08:32:00 +0000 |
| commit | fcb7032e6310eddf40b187b11bc4bc489142123a (patch) | |
| tree | 012b4772390341239c6d618a6b2c1abd74845107 /include | |
| parent | 1910e4dcfd3fefdaacfc2daca5cfc022e24c2504 (diff) | |
| parent | 3c8e39d4b5ca150438470e5dae02eb6dba77ee01 (diff) | |
Merge flint.arm.linux.org.uk:/usr/src/bk/linux-2.6
into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-serial
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h index 677e67b18220..465f19a0d53d 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h @@ -49,7 +49,6 @@ struct serial_struct { unsigned short iomem_reg_shift; unsigned int port_high; unsigned long iomap_base; /* cookie passed into ioremap */ - int reserved[1]; }; /* |
