[PATCH] Fix pragma packing in ip2 driver

[David Howells <dhowells@redhat.com>]

The attached patch fixes the pragma packing in the ip2 driver by popping the
previous setting rather than explicitly assuming that the correct setting
is 4.

This also gets around a compiler bug in the FRV compiler when building
allmodconfig.

Signed-Off-By: David Howells <dhowells@redhat.com>
---
warthog>diffstat -p1 ip2-pragma-2615rc5.diff 
 drivers/char/ip2/i2pack.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -urp linux-2.6.15-rc5/drivers/char/ip2/i2pack.h linux-2.6.15-rc5-frv/drivers/char/ip2/i2pack.h
--- linux-2.6.15-rc5/drivers/char/ip2/i2pack.h	2004-06-18 13:41:44.000000000 +0100
+++ linux-2.6.15-rc5-frv/drivers/char/ip2/i2pack.h	2006-01-04 17:48:08.000000000 +0000
@@ -358,7 +358,7 @@ typedef struct _failStat
 #define MB_OUT_STRIPPED    0x40  // Board has read all output from fifo 
 #define MB_FATAL_ERROR     0x20  // Board has encountered a fatal error
 
-#pragma pack(4)                  // Reset padding to command-line default
+#pragma pack()                  // Reset padding to command-line default
 
 #endif      // I2PACK_H
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/