diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-03 08:57:03 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 01:36:33 -0800 |
| commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
| tree | 31894d9dc2c29f31234e479de520a50858cce54c /arch/arm/mach-s3c24xx/Makefile.boot | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 8c3d7c30c306d83ff9c303f42307765a5a7bc254 (diff) | |
| download | linux-stable-880bcd4a8363f24375027f9ded4670960dcfa70a.tar.gz linux-stable-880bcd4a8363f24375027f9ded4670960dcfa70a.tar.bz2 linux-stable-880bcd4a8363f24375027f9ded4670960dcfa70a.zip | |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to 'arch/arm/mach-s3c24xx/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-s3c24xx/Makefile.boot | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/Makefile.boot b/arch/arm/mach-s3c24xx/Makefile.boot new file mode 100644 index 000000000000..4457605ba04a --- /dev/null +++ b/arch/arm/mach-s3c24xx/Makefile.boot @@ -0,0 +1,7 @@ +ifeq ($(CONFIG_PM_H1940),y) + zreladdr-y += 0x30108000 + params_phys-y := 0x30100100 +else + zreladdr-y += 0x30008000 + params_phys-y := 0x30000100 +endif |