diff options
author | Takashi Iwai | 2010-08-18 15:17:30 +0200 |
---|---|---|
committer | Takashi Iwai | 2010-08-18 15:17:30 +0200 |
commit | 6ab561c8aab2e4af535f09adbc6253f958536848 (patch) | |
tree | 37846adb4ea106485720d113e252d71d615c23ed /arch/mips/include/asm/sn | |
parent | ALSA: usb: USB3 SuperSpeed sound support (diff) | |
parent | ALSA: ISA: Remove snd-sgalaxy (diff) | |
download | kernel-qcow2-linux-6ab561c8aab2e4af535f09adbc6253f958536848.tar.gz kernel-qcow2-linux-6ab561c8aab2e4af535f09adbc6253f958536848.tar.xz kernel-qcow2-linux-6ab561c8aab2e4af535f09adbc6253f958536848.zip |
Merge branch 'topic/isa' into topic/misc
Diffstat (limited to 'arch/mips/include/asm/sn')
-rw-r--r-- | arch/mips/include/asm/sn/agent.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/include/asm/sn/agent.h b/arch/mips/include/asm/sn/agent.h index ac4ea85c3a5c..dc81114d4742 100644 --- a/arch/mips/include/asm/sn/agent.h +++ b/arch/mips/include/asm/sn/agent.h @@ -11,7 +11,6 @@ #ifndef _ASM_SGI_SN_AGENT_H #define _ASM_SGI_SN_AGENT_H -#include <linux/topology.h> #include <asm/sn/addrs.h> #include <asm/sn/arch.h> |