git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'upstream-fixes' and 'magicmouse' into for-linus
[pandora-kernel.git]
/
drivers
/
w1
/
w1_log.h
diff --git
a/drivers/w1/w1_log.h
b/drivers/w1/w1_log.h
index
fe6bdf4
..
9c7bd62
100644
(file)
--- a/
drivers/w1/w1_log.h
+++ b/
drivers/w1/w1_log.h
@@
-1,7
+1,7
@@
/*
* w1_log.h
*
/*
* w1_log.h
*
- * Copyright (c) 2004 Evgeniy Polyakov <
johnpol@2ka.mipt.ru
>
+ * Copyright (c) 2004 Evgeniy Polyakov <
zbr@ioremap.net
>
*
*
* This program is free software; you can redistribute it and/or modify
*
*
* This program is free software; you can redistribute it and/or modify
@@
-30,7
+30,7
@@
# define assert(expr) \
if(unlikely(!(expr))) { \
printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \
# define assert(expr) \
if(unlikely(!(expr))) { \
printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \
-
#expr,__FILE__,__FUNCTION__,__LINE__);
\
+
#expr, __FILE__, __func__, __LINE__);
\
}
#endif
}
#endif