diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 11:27:29 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 11:27:29 -0400 |
| commit | e9dc122166b8d863d3057a66ada04838e5548e52 (patch) | |
| tree | 749e15bf719b64bf9113db7acd8e043d9742cb26 /include/linux/sysrq.h | |
| parent | 560ab42ef923aaf2e4347315bdfcc74b2708972c (diff) | |
| parent | 405d8f8b1d936414da2093d4149ff790ff3f84a5 (diff) | |
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming
Conflicts:
net/sunrpc/cache.c
Diffstat (limited to 'include/linux/sysrq.h')
| -rw-r--r-- | include/linux/sysrq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h index 98a1d8cfb73d..99adcdc0d3ca 100644 --- a/include/linux/sysrq.h +++ b/include/linux/sysrq.h | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | #ifndef _LINUX_SYSRQ_H | 14 | #ifndef _LINUX_SYSRQ_H |
| 15 | #define _LINUX_SYSRQ_H | 15 | #define _LINUX_SYSRQ_H |
| 16 | 16 | ||
| 17 | #include <linux/errno.h> | ||
| 18 | |||
| 17 | struct pt_regs; | 19 | struct pt_regs; |
| 18 | struct tty_struct; | 20 | struct tty_struct; |
| 19 | 21 | ||