diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/asm-s390/bugs.h | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/asm-s390/bugs.h')
| -rw-r--r-- | include/asm-s390/bugs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/bugs.h b/include/asm-s390/bugs.h index 2c3659621314..011f1e6a2a6c 100644 --- a/include/asm-s390/bugs.h +++ b/include/asm-s390/bugs.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | * void check_bugs(void); | 16 | * void check_bugs(void); |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | static void __init check_bugs(void) | 19 | static inline void check_bugs(void) |
| 20 | { | 20 | { |
| 21 | /* s390 has no bugs ... */ | 21 | /* s390 has no bugs ... */ |
| 22 | } | 22 | } |