diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
| commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
| tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/arm/lib | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/copy_page.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/csumpartialcopyuser.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/getuser.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/putuser.S | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S index 4c38abdbe497..68117968482b 100644 --- a/arch/arm/lib/copy_page.S +++ b/arch/arm/lib/copy_page.S | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
| 14 | #include <asm/constants.h> | 14 | #include <asm/asm-offsets.h> |
| 15 | 15 | ||
| 16 | #define COPY_COUNT (PAGE_SZ/64 PLD( -1 )) | 16 | #define COPY_COUNT (PAGE_SZ/64 PLD( -1 )) |
| 17 | 17 | ||
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S index 46a2dc962e9d..333bca292de9 100644 --- a/arch/arm/lib/csumpartialcopyuser.S +++ b/arch/arm/lib/csumpartialcopyuser.S | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
| 15 | #include <asm/errno.h> | 15 | #include <asm/errno.h> |
| 16 | #include <asm/constants.h> | 16 | #include <asm/asm-offsets.h> |
| 17 | 17 | ||
| 18 | .text | 18 | .text |
| 19 | 19 | ||
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 64aa6f4fe5e4..d204018070a4 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000. | 26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000. |
| 27 | * Note also that it is intended that __get_user_bad is not global. | 27 | * Note also that it is intended that __get_user_bad is not global. |
| 28 | */ | 28 | */ |
| 29 | #include <asm/constants.h> | 29 | #include <asm/asm-offsets.h> |
| 30 | #include <asm/thread_info.h> | 30 | #include <asm/thread_info.h> |
| 31 | #include <asm/errno.h> | 31 | #include <asm/errno.h> |
| 32 | 32 | ||
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S index b09398d95aac..4593e9c07f05 100644 --- a/arch/arm/lib/putuser.S +++ b/arch/arm/lib/putuser.S | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000 | 26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000 |
| 27 | * Note also that it is intended that __put_user_bad is not global. | 27 | * Note also that it is intended that __put_user_bad is not global. |
| 28 | */ | 28 | */ |
| 29 | #include <asm/constants.h> | 29 | #include <asm/asm-offsets.h> |
| 30 | #include <asm/thread_info.h> | 30 | #include <asm/thread_info.h> |
| 31 | #include <asm/errno.h> | 31 | #include <asm/errno.h> |
| 32 | 32 | ||