diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 07:11:23 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 07:11:23 +0200 |
| commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
| tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /include/asm-sh | |
| parent | Input: move input_device_id to mod_devicetable.h (diff) | |
| parent | [PATCH] slab: fix crash on __drain_alien_cahce() during CPU Hotplug (diff) | |
| download | linux-7b7e394185014e0f3bd8989cac937003f20ef9ce.tar.xz linux-7b7e394185014e0f3bd8989cac937003f20ef9ce.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sh')
| -rw-r--r-- | include/asm-sh/numnodes.h | 7 | ||||
| -rw-r--r-- | include/asm-sh/unistd.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/asm-sh/numnodes.h b/include/asm-sh/numnodes.h deleted file mode 100644 index f73e85b72ecb..000000000000 --- a/include/asm-sh/numnodes.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _ASM_MAX_NUMNODES_H -#define _ASM_MAX_NUMNODES_H - -/* Max 2 Nodes */ -#define NODES_SHIFT 1 - -#endif /* _ASM_MAX_NUMNODES_H */ diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h index f2c8e14d1fd9..05520cebda12 100644 --- a/include/asm-sh/unistd.h +++ b/include/asm-sh/unistd.h @@ -290,7 +290,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_add_key 285 #define __NR_request_key 286 |