diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
| commit | e152f18027552eb34006b35347e72bc805783027 (patch) | |
| tree | ac9765e68597c08c24de447f46bb3e04d9881e1b /arch/ia64/include/asm/unistd.h | |
| parent | ALSA: hdsp - Remove obsolete settings functions (diff) | |
| parent | ALSA: hda - Add Conexant CX20755/20756/20757 codec IDs (diff) | |
| download | linux-e152f18027552eb34006b35347e72bc805783027.tar.xz linux-e152f18027552eb34006b35347e72bc805783027.zip | |
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser
branch.
Diffstat (limited to 'arch/ia64/include/asm/unistd.h')
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 8b3ff2f5b861..c3cc42a15af1 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -11,7 +11,7 @@ -#define NR_syscalls 311 /* length of syscall table */ +#define NR_syscalls 312 /* length of syscall table */ /* * The following defines stop scripts/checksyscalls.sh from complaining about |