summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/spitfire.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-09 09:29:13 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-09 09:29:13 +0200
commit7844b8927e78bfb060ba88c36c99d3e07c3fb631 (patch)
tree9992206cd2beb8de57d90ac3691cf670ddd15222 /arch/sparc/include/asm/spitfire.h
parentMerge tag 'usb-serial-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentLinux 4.6-rc7 (diff)
downloadlinux-7844b8927e78bfb060ba88c36c99d3e07c3fb631.tar.xz
linux-7844b8927e78bfb060ba88c36c99d3e07c3fb631.zip
Merge 4.6-rc7 into usb-next
We want the USB fixes in here to resolve merge issues and make it easier for testing. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc/include/asm/spitfire.h')
-rw-r--r--arch/sparc/include/asm/spitfire.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h
index 56f933816144..1d8321c827a8 100644
--- a/arch/sparc/include/asm/spitfire.h
+++ b/arch/sparc/include/asm/spitfire.h
@@ -48,6 +48,7 @@
#define SUN4V_CHIP_SPARC_M6 0x06
#define SUN4V_CHIP_SPARC_M7 0x07
#define SUN4V_CHIP_SPARC64X 0x8a
+#define SUN4V_CHIP_SPARC_SN 0x8b
#define SUN4V_CHIP_UNKNOWN 0xff
#ifndef __ASSEMBLY__