diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /arch/arm/nwfpe/entry26.S | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/arm/nwfpe/entry26.S')
| -rw-r--r-- | arch/arm/nwfpe/entry26.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/nwfpe/entry26.S b/arch/arm/nwfpe/entry26.S index 51940a96d6a6..3e6fb5d21d64 100644 --- a/arch/arm/nwfpe/entry26.S +++ b/arch/arm/nwfpe/entry26.S | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | It is called from the kernel with code similar to this: | 26 | It is called from the kernel with code similar to this: |
| 27 | 27 | ||
| 28 | mov fp, #0 | 28 | mov fp, #0 |
| 29 | teqp pc, #PSR_I_BIT | MODE_SVC | 29 | teqp pc, #PSR_I_BIT | SVC_MODE |
| 30 | ldr r4, .LC2 | 30 | ldr r4, .LC2 |
| 31 | ldr pc, [r4] @ Call FP module USR entry point | 31 | ldr pc, [r4] @ Call FP module USR entry point |
| 32 | 32 | ||