projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[cascardo/linux.git]
/
arch
/
arm
/
mach-prima2
/
Makefile.boot
diff --git
a/arch/arm/mach-prima2/Makefile.boot
b/arch/arm/mach-prima2/Makefile.boot
index
98167da
..
c77a488
100644
(file)
--- a/
arch/arm/mach-prima2/Makefile.boot
+++ b/
arch/arm/mach-prima2/Makefile.boot
@@
-1,5
+1,3
@@
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000
-
-dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb