Merge tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux

[linux/fpc-iii.git] / arch / arm / mach-s3c24xx / Makefile.boot

ifeq ($(CONFIG_PM_H1940),y)
        zreladdr-y      += 0x30108000
        params_phys-y   := 0x30100100
else
        zreladdr-y      += 0x30008000
        params_phys-y   := 0x30000100
endif