diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
| commit | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (patch) | |
| tree | eddf856286234f28cac747d20eb59d918e1bc8b5 /include/asm-h8300/unistd.h | |
| parent | [PATCH] ahci: do not fail softreset if PHY reports no device (diff) | |
| parent | [PATCH] __group_complete_signal: remove bogus BUG_ON (diff) | |
| download | linux-dev-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.tar.xz linux-dev-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.zip | |
Merge branch 'master'
Conflicts:
drivers/scsi/libata-scsi.c
include/linux/libata.h
Diffstat (limited to 'include/asm-h8300/unistd.h')
| -rw-r--r-- | include/asm-h8300/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h index 56a4a5686c88..adb05159379b 100644 --- a/include/asm-h8300/unistd.h +++ b/include/asm-h8300/unistd.h @@ -285,7 +285,7 @@ #define __NR_mq_timedreceive (__NR_mq_open+3) #define __NR_mq_notify (__NR_mq_open+4) #define __NR_mq_getsetattr (__NR_mq_open+5) -#define __NR_sys_kexec_load 283 +#define __NR_kexec_load 283 #define __NR_waitid 284 /* #define __NR_sys_setaltroot 285 */ #define __NR_add_key 286 |