diff options
| author | David Howells <dhowells@redhat.com> | 2006-01-04 13:01:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:55:35 -0500 |
| commit | a020ff412f0ecbb1e4aae1681b287e5785dd77b5 (patch) | |
| tree | 94fba0f0ade540eaae89051971b49bd29803be51 /drivers | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
[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')
| -rw-r--r-- | drivers/char/ip2/i2pack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ip2/i2pack.h b/drivers/char/ip2/i2pack.h index e9b87a78622c..00342a677c90 100644 --- a/drivers/char/ip2/i2pack.h +++ b/drivers/char/ip2/i2pack.h | |||
| @@ -358,7 +358,7 @@ typedef struct _failStat | |||
| 358 | #define MB_OUT_STRIPPED 0x40 // Board has read all output from fifo | 358 | #define MB_OUT_STRIPPED 0x40 // Board has read all output from fifo |
| 359 | #define MB_FATAL_ERROR 0x20 // Board has encountered a fatal error | 359 | #define MB_FATAL_ERROR 0x20 // Board has encountered a fatal error |
| 360 | 360 | ||
| 361 | #pragma pack(4) // Reset padding to command-line default | 361 | #pragma pack() // Reset padding to command-line default |
| 362 | 362 | ||
| 363 | #endif // I2PACK_H | 363 | #endif // I2PACK_H |
| 364 | 364 | ||