diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-23 12:22:16 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-24 13:27:32 -0500 |
| commit | 8a327f23e23fa509e6e3c2263ae1cc0a67dec387 (patch) | |
| tree | 119abf09e1ec9babaf78e6889187f9d54864b118 /arch/m68k/include/asm/mcfsim.h | |
| parent | 5a9a8d1a99c617df82339456fbdd30d6ed3a856b (diff) | |
| parent | d315777b32a4696feb86f2a0c9e9f39c94683649 (diff) | |
Merge remote branch 'linus/master' into drm-intel-fixes
Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'arch/m68k/include/asm/mcfsim.h')
| -rw-r--r-- | arch/m68k/include/asm/mcfsim.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/mcfsim.h b/arch/m68k/include/asm/mcfsim.h index 6901fd68165b..ebd0304054ad 100644 --- a/arch/m68k/include/asm/mcfsim.h +++ b/arch/m68k/include/asm/mcfsim.h | |||
| @@ -41,8 +41,8 @@ | |||
| 41 | #elif defined(CONFIG_M5407) | 41 | #elif defined(CONFIG_M5407) |
| 42 | #include <asm/m5407sim.h> | 42 | #include <asm/m5407sim.h> |
| 43 | #include <asm/mcfintc.h> | 43 | #include <asm/mcfintc.h> |
| 44 | #elif defined(CONFIG_M548x) | 44 | #elif defined(CONFIG_M54xx) |
| 45 | #include <asm/m548xsim.h> | 45 | #include <asm/m54xxsim.h> |
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| 48 | /****************************************************************************/ | 48 | /****************************************************************************/ |