diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-02-23 00:38:26 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-23 00:38:26 +0100 |
| commit | 7f0ff702cdf51472750f4b6042866f1b83a11215 (patch) | |
| tree | 15ce32849cfb8ff3c7205e97a5f76051c08058b0 /arch/arm/mach-s3c64xx/Makefile.boot | |
| parent | ARM: Merge next-samsung-s3c244x-merge (diff) | |
| parent | ARM: S3C64XX: Eliminate plat-s3c64xx (diff) | |
| download | linux-7f0ff702cdf51472750f4b6042866f1b83a11215.tar.xz linux-7f0ff702cdf51472750f4b6042866f1b83a11215.zip | |
ARM: Merge next-samsung-s3c64xx-platdeletion
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung
Conflicts:
arch/arm/mach-s3c64xx/Makefile (fixed)
Diffstat (limited to 'arch/arm/mach-s3c64xx/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-s3c64xx/Makefile.boot | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile.boot b/arch/arm/mach-s3c64xx/Makefile.boot new file mode 100644 index 000000000000..ba41fdc0a586 --- /dev/null +++ b/arch/arm/mach-s3c64xx/Makefile.boot @@ -0,0 +1,2 @@ + zreladdr-y := 0x50008000 +params_phys-y := 0x50000100 |