From: David Mosberger-Tang <David.Mosberger@acm.org>
Date: Wed, 13 Jul 2005 04:51:00 +0000 (-0700)
Subject: [IA64] Make PCDP work again.
X-Git-Tag: v2.6.13-rc4~115^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f62c4a96f74d6c6dd56d1742697e94a5c2085e87;p=linux-2.6-omap-h63xx.git

[IA64] Make PCDP work again.

Mark's patch added "attribute((packed))" for pcdp_uart, without
accounting for the fact that the structure definition _relied_ on
implicit padding by 6 bytes.  Fix is to make the padding explicit.

Signed-off-by: David Mosberger-Tang <David.Mosberger@acm.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/drivers/firmware/pcdp.h b/drivers/firmware/pcdp.h
index e72cc47de33..ce910d68bd1 100644
--- a/drivers/firmware/pcdp.h
+++ b/drivers/firmware/pcdp.h
@@ -52,6 +52,8 @@ struct pcdp_uart {
 	u32				clock_rate;
 	u8				pci_prog_intfc;
 	u8				flags;
+	u16				conout_index;
+	u32				reserved;
 } __attribute__((packed));
 
 #define PCDP_IF_PCI	1