diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 19:28:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 19:28:04 +0100 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-mx3/Makefile.boot | |
| parent | Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus (diff) | |
| parent | ARM: Fix generic irq chip (diff) | |
| download | linux-dev-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.tar.xz linux-dev-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.zip | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/mach-mx3/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-mx3/Makefile.boot | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/Makefile.boot b/arch/arm/mach-mx3/Makefile.boot deleted file mode 100644 index e1dd366f836b..000000000000 --- a/arch/arm/mach-mx3/Makefile.boot +++ /dev/null @@ -1,3 +0,0 @@ - zreladdr-y := 0x80008000 -params_phys-y := 0x80000100 -initrd_phys-y := 0x80800000 |