diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:52:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:52:55 +0200 |
| commit | 306df04e330bfa0f96bc49fc16db32084fa960f5 (patch) | |
| tree | d312d0a0852f8c5c47084b3c4e1e74c99812ffd0 /arch/arm/mach-prima2/Makefile.boot | |
| parent | 7fbabb52554c6916ce02599f73915576b9329559 (diff) | |
| parent | 6c59c115b0f295434cc4f917d180fecd84d39f81 (diff) | |
Merge branch 'next/soc' into for-next
Conflicts:
arch/arm/mach-omap2/cm-regbits-44xx.h
Diffstat (limited to 'arch/arm/mach-prima2/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-prima2/Makefile.boot | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/Makefile.boot b/arch/arm/mach-prima2/Makefile.boot new file mode 100644 index 00000000000..d023db3ae4f --- /dev/null +++ b/arch/arm/mach-prima2/Makefile.boot @@ -0,0 +1,3 @@ +zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 |