diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /drivers/isdn/hardware/eicon/debuglib.h | |
| parent | bzip2/lzma: centralize format detection (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-2 (diff) | |
| download | linux-b17304245f0db0ac69b795c411407808f3f2796d.tar.xz linux-b17304245f0db0ac69b795c411407808f3f2796d.zip | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'drivers/isdn/hardware/eicon/debuglib.h')
| -rw-r--r-- | drivers/isdn/hardware/eicon/debuglib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/eicon/debuglib.h b/drivers/isdn/hardware/eicon/debuglib.h index 016410cf2273..8ea587783e14 100644 --- a/drivers/isdn/hardware/eicon/debuglib.h +++ b/drivers/isdn/hardware/eicon/debuglib.h @@ -235,7 +235,7 @@ typedef void ( * DbgOld) (unsigned short, char *, va_list) ; typedef void ( * DbgEv) (unsigned short, unsigned long, va_list) ; typedef void ( * DbgIrq) (unsigned short, int, char *, va_list) ; typedef struct _DbgHandle_ -{ char Registered ; /* driver successfull registered */ +{ char Registered ; /* driver successfully registered */ #define DBG_HANDLE_REG_NEW 0x01 /* this (new) structure */ #define DBG_HANDLE_REG_OLD 0x7f /* old structure (see below) */ char Version; /* version of this structure */ |