summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-01-04 18:01:03 +0000
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 13:55:35 -0800
commita020ff412f0ecbb1e4aae1681b287e5785dd77b5 (patch)
tree94fba0f0ade540eaae89051971b49bd29803be51 /drivers/char
parent88026842b0a760145aa71d69e74fbc9ec118ca44 (diff)
downloadop-kernel-dev-a020ff412f0ecbb1e4aae1681b287e5785dd77b5.zip
op-kernel-dev-a020ff412f0ecbb1e4aae1681b287e5785dd77b5.tar.gz
[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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ip2/i2pack.h2
1 files changed, 1 insertions, 1 deletions
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 @@ 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
OpenPOWER on IntegriCloud