diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-20 11:43:59 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-20 11:44:34 +0100 |
| commit | 0f9e9cd61f46c07246e30871fd638ffeaca3c576 (patch) | |
| tree | 1a7b84871da0f2ebad48c6838f66fbe91cc26995 /arch/arm/mach-socfpga/core.h | |
| parent | 86a930d5e9702391f6f997366686a48885f21513 (diff) | |
| parent | 7f0801e566cc78315e5dc383bf3c3b5b5b436048 (diff) | |
| download | kernel_replicant_linux-0f9e9cd61f46c07246e30871fd638ffeaca3c576.tar.gz kernel_replicant_linux-0f9e9cd61f46c07246e30871fd638ffeaca3c576.tar.bz2 kernel_replicant_linux-0f9e9cd61f46c07246e30871fd638ffeaca3c576.zip | |
Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next
Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'arch/arm/mach-socfpga/core.h')
| -rw-r--r-- | arch/arm/mach-socfpga/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/core.h b/arch/arm/mach-socfpga/core.h index 483cb467bf65..a0f3b1cd497c 100644 --- a/arch/arm/mach-socfpga/core.h +++ b/arch/arm/mach-socfpga/core.h @@ -45,6 +45,6 @@ extern char secondary_trampoline, secondary_trampoline_end; extern unsigned long socfpga_cpu1start_addr; -#define SOCFPGA_SCU_VIRT_BASE 0xfffec000 +#define SOCFPGA_SCU_VIRT_BASE 0xfee00000 #endif |