diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:07 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:07 -0400 |
| commit | 5fcdb16bd04fdeb313ee33bb269b04e59a9abf91 (patch) | |
| tree | aa167b3cc6f3ae8765e19284966f938f7dcf1f85 /arch/arm/mach-s3c2410/Makefile.boot | |
| parent | 5a5c419fe902458bfef936e32dc6472de04c56cf (diff) | |
| parent | 192ff91fc84e067a3babfddb96114a51c939548e (diff) | |
ARM: Merge for-2635/rx1950
Merge branch 'for-2635/rx1950' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c2410/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-s3c2410/Makefile.boot | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/Makefile.boot b/arch/arm/mach-s3c2410/Makefile.boot index 7dab2a0325b5..58c1dd7f8e1d 100644 --- a/arch/arm/mach-s3c2410/Makefile.boot +++ b/arch/arm/mach-s3c2410/Makefile.boot | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | zreladdr-y := 0x30008000 | 1 | ifeq ($(CONFIG_PM_H1940),y) |
| 2 | params_phys-y := 0x30000100 | 2 | zreladdr-y := 0x30108000 |
| 3 | 3 | params_phys-y := 0x30100100 | |
| 4 | else | ||
| 5 | zreladdr-y := 0x30008000 | ||
| 6 | params_phys-y := 0x30000100 | ||
| 7 | endif | ||