diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-08 10:52:23 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-08 10:52:23 -0500 |
| commit | 073c460311662eff7beb429de21acdbf7d90a4cb (patch) | |
| tree | d5cd52a6112739d55c2928c7b435fecf8eab0b75 /arch/arm | |
| parent | b981f980b068617e021736eb19092919fc7d0e53 (diff) | |
| parent | c564a0cb9d0c7f4ac50f1e9ca8bc67fd66cd550f (diff) | |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-sa1100/Makefile.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/Makefile.boot b/arch/arm/mach-sa1100/Makefile.boot index 5a616f6e5612..f7951aa04562 100644 --- a/arch/arm/mach-sa1100/Makefile.boot +++ b/arch/arm/mach-sa1100/Makefile.boot | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ifeq ($(CONFIG_ARCH_SA1100),y) | 1 | ifeq ($(CONFIG_SA1111),y) |
| 2 | zreladdr-$(CONFIG_SA1111) += 0xc0208000 | 2 | zreladdr-y += 0xc0208000 |
| 3 | else | 3 | else |
| 4 | zreladdr-y += 0xc0008000 | 4 | zreladdr-y += 0xc0008000 |
| 5 | endif | 5 | endif |