diff options
| author | Linus Torvalds <[email protected]> | 2010-10-22 18:17:06 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-10-22 18:17:06 +0000 |
| commit | db08bf0877f3464fb0c2c37dcdd9f9683192ea26 (patch) | |
| tree | c9d47587ac07cb1622156899414c78f097fcb0c9 /include/asm-generic/kdebug.h | |
| parent | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl (diff) | |
| parent | asm-generic/io.h: allow people to override individual funcs (diff) | |
| download | kernel-db08bf0877f3464fb0c2c37dcdd9f9683192ea26.tar.gz kernel-db08bf0877f3464fb0c2c37dcdd9f9683192ea26.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
* git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic/io.h: allow people to override individual funcs
bitops: remove duplicated extern declarations
bitops: make asm-generic/bitops/find.h more generic
asm-generic: kdebug.h: Checkpatch cleanup
asm-generic: fcntl: make exported headers use strict posix types
asm-generic: cmpxchg does not handle non-long arguments
asm-generic: make atomic_add_unless a function
Diffstat (limited to 'include/asm-generic/kdebug.h')
| -rw-r--r-- | include/asm-generic/kdebug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/kdebug.h b/include/asm-generic/kdebug.h index 11e57b6a85fc..d1814497bcdb 100644 --- a/include/asm-generic/kdebug.h +++ b/include/asm-generic/kdebug.h @@ -3,7 +3,7 @@ enum die_val { DIE_UNUSED, - DIE_OOPS=1 + DIE_OOPS = 1, }; #endif /* _ASM_GENERIC_KDEBUG_H */ |