diff options
| author | Dmitry Torokhov | 2007-05-08 07:31:11 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2007-05-08 07:31:11 +0200 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /include/asm-arm/arch-ns9xxx/processor.h | |
| parent | Input: aaed2000_kbd - convert to use polldev library (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | kernel-qcow2-linux-334d0dd8b660557608142f0f77abc6812b48f08b.tar.gz kernel-qcow2-linux-334d0dd8b660557608142f0f77abc6812b48f08b.tar.xz kernel-qcow2-linux-334d0dd8b660557608142f0f77abc6812b48f08b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/arch-ns9xxx/processor.h')
| -rw-r--r-- | include/asm-arm/arch-ns9xxx/processor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/arch-ns9xxx/processor.h b/include/asm-arm/arch-ns9xxx/processor.h index 716c106ac0bf..223e51b8e104 100644 --- a/include/asm-arm/arch-ns9xxx/processor.h +++ b/include/asm-arm/arch-ns9xxx/processor.h @@ -13,6 +13,7 @@ #include <asm/mach-types.h> -#define processor_is_ns9360() (machine_is_cc9p9360dev()) +#define processor_is_ns9360() (machine_is_cc9p9360dev() \ + || machine_is_cc9p9360js()) #endif /* ifndef __ASM_ARCH_PROCESSOR_H */ |