diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 00:54:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 00:54:37 -0400 |
| commit | 6a302358d87fedaf7bda12b8e909265ebf1ce674 (patch) | |
| tree | 9bb5d79d812d531ae7031fe4aecf18151e41f716 /include/asm-sh/ubc.h | |
| parent | 8e268f333012c62fc6a5a10e1e2a19c1c389853e (diff) | |
| parent | e06c4e5775b1efc4e476f2430439e45867775f5f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
sh: Fix fs.h removal from mm.h regressions.
sh: fix get_wchan() for SH kernels without framepointers
sh: arch/sh/boot - fix shell usage
rtc: rtc-sh: Correct sh_rtc_set_time() for some SH-3 parts.
sh: remove support for sh7300 and solution engine 7300
sh: Add sh to the CC_OPTIMIZE_FOR_SIZE dependencies.
sh: Kill off virt_to_bus()/bus_to_virt().
sh: sh-sci - fix SH7708 support
sh: Restrict DSP support to specific CPUs.
sh: Silence sq compile warning on sh4 nommu.
sh: Kill the rest of the SE73180 cruft.
sh: remove support for sh73180 and solution engine 73180
sh: remove old broken pint code
sh: Reclaim beginning of P3 space for vmalloc area.
sh: Fix Dreamcast DMA issues.
sh: Add kmap_coherent()/kunmap_coherent() interface for SH-4.
Diffstat (limited to 'include/asm-sh/ubc.h')
| -rw-r--r-- | include/asm-sh/ubc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-sh/ubc.h b/include/asm-sh/ubc.h index 38d46e01b846..56f4e30dc49c 100644 --- a/include/asm-sh/ubc.h +++ b/include/asm-sh/ubc.h | |||
| @@ -15,8 +15,7 @@ | |||
| 15 | #include <asm/cpu/ubc.h> | 15 | #include <asm/cpu/ubc.h> |
| 16 | 16 | ||
| 17 | /* User Break Controller */ | 17 | /* User Break Controller */ |
| 18 | #if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \ | 18 | #if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) |
| 19 | defined(CONFIG_CPU_SUBTYPE_SH7300) | ||
| 20 | #define UBC_TYPE_SH7729 (current_cpu_data.type == CPU_SH7729) | 19 | #define UBC_TYPE_SH7729 (current_cpu_data.type == CPU_SH7729) |
| 21 | #else | 20 | #else |
| 22 | #define UBC_TYPE_SH7729 0 | 21 | #define UBC_TYPE_SH7729 0 |