diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-m68knommu/MC68328.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-m68knommu/MC68328.h')
| -rw-r--r-- | include/asm-m68knommu/MC68328.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68knommu/MC68328.h b/include/asm-m68knommu/MC68328.h index 4f5a9845f5be..a337e56d09bf 100644 --- a/include/asm-m68knommu/MC68328.h +++ b/include/asm-m68knommu/MC68328.h | |||
| @@ -993,7 +993,7 @@ typedef volatile struct { | |||
| 993 | volatile unsigned short int pad1; | 993 | volatile unsigned short int pad1; |
| 994 | volatile unsigned short int pad2; | 994 | volatile unsigned short int pad2; |
| 995 | volatile unsigned short int pad3; | 995 | volatile unsigned short int pad3; |
| 996 | } m68328_uart __attribute__((packed)); | 996 | } __attribute__((packed)) m68328_uart; |
| 997 | 997 | ||
| 998 | 998 | ||
| 999 | /********** | 999 | /********** |