diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
tree | e786da7145d83c19a594adf76ed90d52c51058b1 /arch/arm/mach-pnx4008/Makefile.boot | |
parent | [PATCH] libata: convert several bmdma-style controllers to new EH, take #3 (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff) | |
download | linux-dev-71d530cd1b6d97094481002a04c77fea1c8e1c22.tar.xz linux-dev-71d530cd1b6d97094481002a04c77fea1c8e1c22.zip |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'arch/arm/mach-pnx4008/Makefile.boot')
-rw-r--r-- | arch/arm/mach-pnx4008/Makefile.boot | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pnx4008/Makefile.boot b/arch/arm/mach-pnx4008/Makefile.boot new file mode 100644 index 000000000000..44c7117e20dd --- /dev/null +++ b/arch/arm/mach-pnx4008/Makefile.boot @@ -0,0 +1,4 @@ + zreladdr-y := 0x80008000 +params_phys-y := 0x80000100 +initrd_phys-y := 0x80800000 + |