aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/gpio.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-02-22 13:47:49 +0100
committerLinus Walleij <linus.walleij@linaro.org>2016-02-22 13:47:49 +0100
commit3cf42efc3479806bc5db5176fd440d23bb73854b (patch)
treea6a0a57cbe89a4f779625f8ce6e8ebc7ea49f2c0 /arch/powerpc/include/asm/gpio.h
parent6ec9249a83b00a754af435ed57ad02ffed105d93 (diff)
parent9d8cc89c316d9cc8ff269068ac8f904f13b5a70d (diff)
downloadkernel_replicant_linux-3cf42efc3479806bc5db5176fd440d23bb73854b.tar.gz
kernel_replicant_linux-3cf42efc3479806bc5db5176fd440d23bb73854b.tar.bz2
kernel_replicant_linux-3cf42efc3479806bc5db5176fd440d23bb73854b.zip
Merge branch 'devel' into for-next
Diffstat (limited to 'arch/powerpc/include/asm/gpio.h')
-rw-r--r--arch/powerpc/include/asm/gpio.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/gpio.h b/arch/powerpc/include/asm/gpio.h
deleted file mode 100644
index b3799d88ffcf..000000000000
--- a/arch/powerpc/include/asm/gpio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __LINUX_GPIO_H
-#warning Include linux/gpio.h instead of asm/gpio.h
-#include <linux/gpio.h>
-#endif