git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
char
/
ip2
/
i2ellis.h
diff --git
a/drivers/char/ip2/i2ellis.h
b/drivers/char/ip2/i2ellis.h
index
510b026
..
4333050
100644
(file)
--- a/
drivers/char/ip2/i2ellis.h
+++ b/
drivers/char/ip2/i2ellis.h
@@
-47,7
+47,6
@@
//----------------------
// Mandatory Includes:
//----------------------
//----------------------
// Mandatory Includes:
//----------------------
-#include <linux/config.h>
#include "ip2types.h"
#include "i2hw.h" // The hardware definitions
#include "ip2types.h"
#include "i2hw.h" // The hardware definitions
@@
-607,9
+606,9
@@
static int iiDownloadAll(i2eBordStrPtr, loadHdrStrPtr, int, int);
// code and returning.
//
#define COMPLETE(pB,code) \
// code and returning.
//
#define COMPLETE(pB,code) \
-
if(1)
{ \
+
do
{ \
pB->i2eError = code; \
return (code == I2EE_GOOD);\
pB->i2eError = code; \
return (code == I2EE_GOOD);\
- }
+ }
while (0)
#endif // I2ELLIS_H
#endif // I2ELLIS_H