diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 22:21:02 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-08-08 22:21:02 +0200 |
commit | e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11 (patch) | |
tree | d27d2fea50a384d97aa2d0cf5c8657c916f761d4 /drivers/isdn/gigaset/gigaset.h | |
parent | Input: paper over a bug in Synaptics X driver (diff) | |
parent | Linux 2.6.27-rc1 (diff) | |
download | linux-e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11.tar.xz linux-e4ddcb0a6bf04d53ce77b4eb87bbbb32c4261d11.zip |
Merge commit 'v2.6.27-rc1' into for-linus
Diffstat (limited to 'drivers/isdn/gigaset/gigaset.h')
-rw-r--r-- | drivers/isdn/gigaset/gigaset.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h index f365993161fc..003752954993 100644 --- a/drivers/isdn/gigaset/gigaset.h +++ b/drivers/isdn/gigaset/gigaset.h @@ -106,7 +106,6 @@ enum debuglevel { #undef err #undef info #undef warn -#undef notice #define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \ format "\n" , ## arg) @@ -114,8 +113,6 @@ enum debuglevel { format "\n" , ## arg) #define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " \ format "\n" , ## arg) -#define notice(format, arg...) printk(KERN_NOTICE KBUILD_MODNAME ": " \ - format "\n" , ## arg) #ifdef CONFIG_GIGASET_DEBUG |