diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 11:37:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 11:37:49 -0700 |
commit | 91b90475e793e84a57d956af8c52645e292badcb (patch) | |
tree | 8de670e02f99a2a2bde82384104dcb8cb09cdadf /arch/arm/common/sharpsl_param.c | |
parent | bcc408b75b707f46da1f81058ffa3c9df6f0170f (diff) | |
parent | f0ffeddc897a5cc5d5c6cc1b99a8799a8b34b28f (diff) | |
download | linux-91b90475e793e84a57d956af8c52645e292badcb.tar.bz2 |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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 @@ * them early in the boot process, then pass them to the appropriate drivers. * Not all devices use all paramaters but the format is common to all. */ -#ifdef ARCH_SA1100 +#ifdef CONFIG_ARCH_SA1100 #define PARAM_BASE 0xe8ffc000 #else #define PARAM_BASE 0xa0000a00 |