diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-02 22:41:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-02 22:41:36 +0100 |
| commit | 923a789b49c7269a0245d5af6afe486188d940df (patch) | |
| tree | c3f168427372e64f7467a794f313416da5086ba0 /fs/xfs/support/debug.h | |
| parent | 103ceffb9501531f6931df6aebc11a05189201f0 (diff) | |
| parent | b840d79631c882786925303c2b0f4fefc31845ed (diff) | |
Merge branch 'linus' into x86/cleanups
Conflicts:
arch/x86/kernel/reboot.c
Diffstat (limited to 'fs/xfs/support/debug.h')
| -rw-r--r-- | fs/xfs/support/debug.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h index 75845f95081..6f4fd37c67a 100644 --- a/fs/xfs/support/debug.h +++ b/fs/xfs/support/debug.h @@ -27,8 +27,6 @@ #define CE_ALERT 1 /* alert */ #define CE_PANIC 0 /* panic */ -extern void icmn_err(int, char *, va_list) - __attribute__ ((format (printf, 2, 0))); extern void cmn_err(int, char *, ...) __attribute__ ((format (printf, 2, 3))); extern void assfail(char *expr, char *f, int l); |