diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:07 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:07 -0400 |
| commit | 5fcdb16bd04fdeb313ee33bb269b04e59a9abf91 (patch) | |
| tree | aa167b3cc6f3ae8765e19284966f938f7dcf1f85 /arch/arm/Makefile | |
| parent | 5a5c419fe902458bfef936e32dc6472de04c56cf (diff) | |
| parent | 192ff91fc84e067a3babfddb96114a51c939548e (diff) | |
ARM: Merge for-2635/rx1950
Merge branch 'for-2635/rx1950' into for-linus/samsung2
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ed820e737a8a..eddcbba87c67 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -110,6 +110,8 @@ CHECKFLAGS += -D__arm__ | |||
| 110 | head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o | 110 | head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o |
| 111 | textofs-y := 0x00008000 | 111 | textofs-y := 0x00008000 |
| 112 | textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000 | 112 | textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000 |
| 113 | # We don't want the htc bootloader to corrupt kernel during resume | ||
| 114 | textofs-$(CONFIG_PM_H1940) := 0x00108000 | ||
| 113 | # SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory | 115 | # SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory |
| 114 | ifeq ($(CONFIG_ARCH_SA1100),y) | 116 | ifeq ($(CONFIG_ARCH_SA1100),y) |
| 115 | textofs-$(CONFIG_SA1111) := 0x00208000 | 117 | textofs-$(CONFIG_SA1111) := 0x00208000 |