summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2015-02-28 22:59:42 +0100
committerJesper Nilsson <jespern@axis.com>2015-09-05 00:56:46 +0200
commit889d74a4d40f60427d0482bc271bfc5660a1157b (patch)
treecf87122a196053e3ec4f04f39fd7ef0470f2f7e0 /arch/cris
parent0c02fa2f4ef47334387aeb3aef21ccdab6513459 (diff)
downloadtalos-obmc-linux-889d74a4d40f60427d0482bc271bfc5660a1157b.tar.gz
talos-obmc-linux-889d74a4d40f60427d0482bc271bfc5660a1157b.zip
CRIS: UAPI: use generic auxvec.h
CRIS's auxvec.h is empty just like the asm-generic version. Effective diff: -#ifndef __ASMCRIS_AUXVEC_H -#define __ASMCRIS_AUXVEC_H +#ifndef __ASM_GENERIC_AUXVEC_H +#define __ASM_GENERIC_AUXVEC_H + Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/include/asm/Kbuild1
-rw-r--r--arch/cris/include/uapi/asm/auxvec.h4
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 1e19a4f06565..1ee91be2c915 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -1,4 +1,5 @@
generic-y += atomic.h
+generic-y += auxvec.h
generic-y += barrier.h
generic-y += bitsperlong.h
generic-y += clkdev.h
diff --git a/arch/cris/include/uapi/asm/auxvec.h b/arch/cris/include/uapi/asm/auxvec.h
deleted file mode 100644
index cb30b01bf19f..000000000000
--- a/arch/cris/include/uapi/asm/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASMCRIS_AUXVEC_H
-#define __ASMCRIS_AUXVEC_H
-
-#endif
OpenPOWER on IntegriCloud