commit a020ff412f0ecbb1e4aae1681b287e5785dd77b5
author David Howells <dhowells@redhat.com> Wed Jan 04 18:01:03 2006 +0000
committer Linus Torvalds <torvalds@g5.osdl.org> Wed Jan 04 13:55:35 2006 -0800
tree 94fba0f0ade540eaae89051971b49bd29803be51
parent 88026842b0a760145aa71d69e74fbc9ec118ca44

[PATCH] Fix pragma packing in ip2 driver

This 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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/char/ip2/i2pack.h

diff --git a/drivers/char/ip2/i2pack.h b/drivers/char/ip2/i2pack.h
index e9b87a7..00342a6 100644
--- a/drivers/char/ip2/i2pack.h
+++ b/drivers/char/ip2/i2pack.h
@@ -358,7 +358,7 @@
 #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