diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-m68knommu/MC68VZ328.h | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-m68knommu/MC68VZ328.h')
| -rw-r--r-- | include/asm-m68knommu/MC68VZ328.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68knommu/MC68VZ328.h b/include/asm-m68knommu/MC68VZ328.h index df74322f37ed..2b9bf626a0a5 100644 --- a/include/asm-m68knommu/MC68VZ328.h +++ b/include/asm-m68knommu/MC68VZ328.h | |||
| @@ -909,7 +909,7 @@ typedef struct { | |||
| 909 | volatile unsigned short int nipr; | 909 | volatile unsigned short int nipr; |
| 910 | volatile unsigned short int hmark; | 910 | volatile unsigned short int hmark; |
| 911 | volatile unsigned short int unused; | 911 | volatile unsigned short int unused; |
| 912 | } m68328_uart __attribute__((packed)); | 912 | } __attribute__((packed)) m68328_uart; |
| 913 | 913 | ||
| 914 | 914 | ||
| 915 | 915 | ||