diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-03 13:39:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-03 13:39:02 -0400 |
commit | 7e31aa11fc672bbe0dd0da59513c9efe3809ced7 (patch) | |
tree | 0aafe6a0045230950ce6b26579a053da12614a49 /arch/arm/nwfpe/fpa11.h | |
parent | 071f4924844c435a3ae0cdbab7d7df2f1da85713 (diff) | |
parent | 9cb7117fa4858468014f76bd996076985111e955 (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5182/1: pxa: Fix pcm990 compilation
[ARM] Fix explicit asm(-arm)?/arch-foo references
[ARM] move include/asm-arm to arch/arm/include/asm
[ARM] Remove explicit dependency for misc.o from compressed/Makefile
[ARM] initrd: claim initrd memory exclusively
[ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
[ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
[ARM] add Sascha Hauer as Freescale i.MX Maintainer
[ARM] i.MX: add missing clock functions exports
[ARM] i.MX: remove set_imx_fb_info() export
[ARM] mx1ads: make mmc platform data available for modules
[ARM] mx2: add missing Kconfig dependency
Diffstat (limited to 'arch/arm/nwfpe/fpa11.h')
-rw-r--r-- | arch/arm/nwfpe/fpa11.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/nwfpe/fpa11.h b/arch/arm/nwfpe/fpa11.h index 4a4d02c09112..386cbd13eaf4 100644 --- a/arch/arm/nwfpe/fpa11.h +++ b/arch/arm/nwfpe/fpa11.h | |||
@@ -69,7 +69,7 @@ typedef union tagFPREG { | |||
69 | * This structure is exported to user space. Do not re-order. | 69 | * This structure is exported to user space. Do not re-order. |
70 | * Only add new stuff to the end, and do not change the size of | 70 | * Only add new stuff to the end, and do not change the size of |
71 | * any element. Elements of this structure are used by user | 71 | * any element. Elements of this structure are used by user |
72 | * space, and must match struct user_fp in include/asm-arm/user.h. | 72 | * space, and must match struct user_fp in <asm/user.h>. |
73 | * We include the byte offsets below for documentation purposes. | 73 | * We include the byte offsets below for documentation purposes. |
74 | * | 74 | * |
75 | * The size of this structure and FPREG are checked by fpmodule.c | 75 | * The size of this structure and FPREG are checked by fpmodule.c |