[svn-commits] tzafrir: branch linux/tzafrir/sysfs r8813 - in /linux/team/tzafrir/sysfs: ./ ...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sun Jun 27 14:02:42 2010
New Revision: 8813

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8813
Log:
chan_notice() now works

Make chan_notice() and does not complain about undefined 'chan'.

Merged revisions 8809 via svnmerge from 
http://svn.digium.com/svn/dahdi/linux/trunk

Modified:
    linux/team/tzafrir/sysfs/   (props changed)
    linux/team/tzafrir/sysfs/include/dahdi/kernel.h

Propchange: linux/team/tzafrir/sysfs/
------------------------------------------------------------------------------
    automerge = YES

Propchange: linux/team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jun 27 14:02:42 2010
@@ -1,1 +1,1 @@
-/linux/trunk:1-8807
+/linux/trunk:1-8812

Modified: linux/team/tzafrir/sysfs/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/team/tzafrir/sysfs/include/dahdi/kernel.h?view=diff&rev=8813&r1=8812&r2=8813
==============================================================================
--- linux/team/tzafrir/sysfs/include/dahdi/kernel.h (original)
+++ linux/team/tzafrir/sysfs/include/dahdi/kernel.h Sun Jun 27 14:02:42 2010
@@ -1273,9 +1273,7 @@
 						## __VA_ARGS__)
 #define	span_err(span, fmt, ...)	span_printk(ERR, "", span, fmt, \
 						## __VA_ARGS__)
-#define	chan_info(span, fmt, ...)	chan_printk(INFO, "", chan, fmt, \
-						## __VA_ARGS__)
-#define	chan_notice(span, fmt, ...)	chan_printk(NOTICE, "", chan, fmt, \
+#define	chan_notice(chan, fmt, ...)	chan_printk(NOTICE, "", chan, fmt, \
 						## __VA_ARGS__)
 #define	chan_err(chan, fmt, ...)	chan_printk(ERR, "", chan, fmt, \
 						## __VA_ARGS__)