diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-22 10:58:46 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-22 11:09:03 -0500 |
| commit | 710f957846cff998c681f3701f6f90eda896458f (patch) | |
| tree | ba22ee7b469dd0cee974019cc32630838691f3af /arch/arm/kernel/setup.c | |
| parent | e953fd7bb32f55309a96abd5ceba9cf68d221434 (diff) | |
| parent | 011b9910bdaf2e52c48c012490ab444fceea1959 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge in the conflicting eDP fix.
Conflicts:
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 420b8d6485d6..5ea4fb718b97 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -226,8 +226,8 @@ int cpu_architecture(void) | |||
| 226 | * Register 0 and check for VMSAv7 or PMSAv7 */ | 226 | * Register 0 and check for VMSAv7 or PMSAv7 */ |
| 227 | asm("mrc p15, 0, %0, c0, c1, 4" | 227 | asm("mrc p15, 0, %0, c0, c1, 4" |
| 228 | : "=r" (mmfr0)); | 228 | : "=r" (mmfr0)); |
| 229 | if ((mmfr0 & 0x0000000f) == 0x00000003 || | 229 | if ((mmfr0 & 0x0000000f) >= 0x00000003 || |
| 230 | (mmfr0 & 0x000000f0) == 0x00000030) | 230 | (mmfr0 & 0x000000f0) >= 0x00000030) |
| 231 | cpu_arch = CPU_ARCH_ARMv7; | 231 | cpu_arch = CPU_ARCH_ARMv7; |
| 232 | else if ((mmfr0 & 0x0000000f) == 0x00000002 || | 232 | else if ((mmfr0 & 0x0000000f) == 0x00000002 || |
| 233 | (mmfr0 & 0x000000f0) == 0x00000020) | 233 | (mmfr0 & 0x000000f0) == 0x00000020) |