From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 28 Nov 2016 21:12:18 +0000 (+0100)
Subject: s390: use generic asm-offsets.h
X-Git-Tag: Ubuntu-4.10.0-19.21~2029^2~25
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6bc32bf0a0e6dbe4bc3105cf50b14af8dafb41bc;p=mirror_ubuntu-artful-kernel.git

s390: use generic asm-offsets.h

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 24cb7452bbe7..8aea32fe8bd2 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -1,3 +1,4 @@
+generic-y += asm-offsets.h
 generic-y += clkdev.h
 generic-y += dma-contiguous.h
 generic-y += export.h
diff --git a/arch/s390/include/asm/asm-offsets.h b/arch/s390/include/asm/asm-offsets.h
deleted file mode 100644
index d370ee36a182..000000000000
--- a/arch/s390/include/asm/asm-offsets.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <generated/asm-offsets.h>