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-ia64/resource.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-ia64/resource.h')
| -rw-r--r-- | include/asm-ia64/resource.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ia64/resource.h b/include/asm-ia64/resource.h index 77b1eee01f30..ba2272a87fc7 100644 --- a/include/asm-ia64/resource.h +++ b/include/asm-ia64/resource.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASM_IA64_RESOURCE_H | 2 | #define _ASM_IA64_RESOURCE_H |
| 3 | 3 | ||
| 4 | #include <asm/ustack.h> | 4 | #include <asm/ustack.h> |
| 5 | #define _STK_LIM_MAX DEFAULT_USER_STACK_SIZE | ||
| 6 | #include <asm-generic/resource.h> | 5 | #include <asm-generic/resource.h> |
| 7 | 6 | ||
| 8 | #endif /* _ASM_IA64_RESOURCE_H */ | 7 | #endif /* _ASM_IA64_RESOURCE_H */ |