diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
commit | 4a3381feb823e06c8e2da7e283c17b0b6fdbddcf (patch) | |
tree | e1bef4c3db854bb10fd13dc67415d77b5d999533 /drivers/s390/net/iucv.c | |
parent | [PATCH] libata: fix non-uniform ports handling (diff) | |
parent | x86: save/restore eflags in context switch (diff) | |
download | linux-dev-4a3381feb823e06c8e2da7e283c17b0b6fdbddcf.tar.xz linux-dev-4a3381feb823e06c8e2da7e283c17b0b6fdbddcf.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/s390/net/iucv.c')
-rw-r--r-- | drivers/s390/net/iucv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c index 0e863df4027a..821dde86e240 100644 --- a/drivers/s390/net/iucv.c +++ b/drivers/s390/net/iucv.c @@ -335,8 +335,8 @@ do { \ #else -#define iucv_debug(lvl, fmt, args...) -#define iucv_dumpit(title, buf, len) +#define iucv_debug(lvl, fmt, args...) do { } while (0) +#define iucv_dumpit(title, buf, len) do { } while (0) #endif |