diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /arch/arm/common/sharpsl_param.c | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'arch/arm/common/sharpsl_param.c')
| -rw-r--r-- | arch/arm/common/sharpsl_param.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c index c2c557a224c2..c94864c5b1af 100644 --- a/arch/arm/common/sharpsl_param.c +++ b/arch/arm/common/sharpsl_param.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | * them early in the boot process, then pass them to the appropriate drivers. | 22 | * them early in the boot process, then pass them to the appropriate drivers. |
| 23 | * Not all devices use all paramaters but the format is common to all. | 23 | * Not all devices use all paramaters but the format is common to all. |
| 24 | */ | 24 | */ |
| 25 | #ifdef ARCH_SA1100 | 25 | #ifdef CONFIG_ARCH_SA1100 |
| 26 | #define PARAM_BASE 0xe8ffc000 | 26 | #define PARAM_BASE 0xe8ffc000 |
| 27 | #else | 27 | #else |
| 28 | #define PARAM_BASE 0xa0000a00 | 28 | #define PARAM_BASE 0xa0000a00 |