Pull misc-for-upstream into release branch

[~andy/linux] / arch / x86_64 / lib / thunk.S

diff --git a/arch/x86_64/lib/thunk.S b/arch/x86_64/lib/thunk.S
index 0025535cac8d9fa389016d0b79b84519fab9a073..55e586d352d3c444d35fe7399726666ba94b9adf 100644 (file)
--- a/arch/x86_64/lib/thunk.S
+++ b/arch/x86_64/lib/thunk.S
@@ -5,7 +5,6 @@
  * Subject to the GNU public license, v.2. No warranty of any kind.
  */
 
-       #include <linux/config.h>
        #include <linux/linkage.h>
        #include <asm/dwarf2.h>
        #include <asm/calling.h>