From: David Howells Date: Wed, 4 Jan 2006 18:01:03 +0000 (+0000) Subject: [PATCH] Fix pragma packing in ip2 driver X-Git-Tag: v2.6.16-rc1~474^2~22^2~13 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a020ff412f0ecbb1e4aae1681b287e5785dd77b5;p=linux-2.6 [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 Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/ip2/i2pack.h b/drivers/char/ip2/i2pack.h index e9b87a7862..00342a677c 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