diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 18:48:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 18:48:33 -0400 |
| commit | 514fd7fd01d378a7b5584c657d9807fc28f22079 (patch) | |
| tree | bda3910b7737a4fac464792657ffedcba185d799 /drivers | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
| parent | 99ad25a313bda566a346b46a6015afa65bc0a02b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/pcdp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firmware/pcdp.h b/drivers/firmware/pcdp.h index e72cc47de33b..ce910d68bd19 100644 --- a/drivers/firmware/pcdp.h +++ b/drivers/firmware/pcdp.h | |||
| @@ -52,6 +52,8 @@ struct pcdp_uart { | |||
| 52 | u32 clock_rate; | 52 | u32 clock_rate; |
| 53 | u8 pci_prog_intfc; | 53 | u8 pci_prog_intfc; |
| 54 | u8 flags; | 54 | u8 flags; |
| 55 | u16 conout_index; | ||
| 56 | u32 reserved; | ||
| 55 | } __attribute__((packed)); | 57 | } __attribute__((packed)); |
| 56 | 58 | ||
| 57 | #define PCDP_IF_PCI 1 | 59 | #define PCDP_IF_PCI 1 |