Changeset 61c0402 in mainline for kernel/generic/include/debug.h

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/include/debug.h (modified) (2 diffs)

kernel/generic/include/debug.h

@@ -75 +75 @@
 #       define LOG(format, ...) \
                 printf("%s() at %s:%u: " format "\n", __func__, __FILE__, \
-                        __LINE__, ##__VA_ARGS__);
+                    __LINE__, ##__VA_ARGS__);
 #else
 #       define LOG(format, ...)
@@ -92 +92 @@
                 { \
                         printf("%s() at %s:%u: " #fnc "\n", __func__, __FILE__, \
-                        __LINE__); \
+                            __LINE__); \
                         fnc; \
                 }