diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 23:31:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 23:31:32 -0500 |
| commit | 36ddf5bbdea7ba4582abc62f106f0f0e9f0b6b91 (patch) | |
| tree | 163d637dfda12eba3f8822d3b2941869b2d0ba00 /include | |
| parent | a41622eaa97e40c811fb7756f403c0d4caa65654 (diff) | |
| parent | 104c7b03ea0913a24be103db66d8cf1f1f99a49a (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[ARM] 3383/3: ixp2000: ixdp2x01 platform serial conversion
[SERIAL] amba-pl010: Remove accessor macros
[SERIAL] remove 8250_acpi (replaced by 8250_pnp and PNPACPI)
[SERIAL] icom: select FW_LOADER
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_8250.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h index 73b464f0926a..8e9681413726 100644 --- a/include/linux/serial_8250.h +++ b/include/linux/serial_8250.h | |||
| @@ -37,6 +37,7 @@ enum { | |||
| 37 | PLAT8250_DEV_LEGACY = -1, | 37 | PLAT8250_DEV_LEGACY = -1, |
| 38 | PLAT8250_DEV_PLATFORM, | 38 | PLAT8250_DEV_PLATFORM, |
| 39 | PLAT8250_DEV_PLATFORM1, | 39 | PLAT8250_DEV_PLATFORM1, |
| 40 | PLAT8250_DEV_PLATFORM2, | ||
| 40 | PLAT8250_DEV_FOURPORT, | 41 | PLAT8250_DEV_FOURPORT, |
| 41 | PLAT8250_DEV_ACCENT, | 42 | PLAT8250_DEV_ACCENT, |
| 42 | PLAT8250_DEV_BOCA, | 43 | PLAT8250_DEV_BOCA, |