Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / c6x / include / asm / prom.h

diff --git a/arch/c6x/include/asm/prom.h b/arch/c6x/include/asm/prom.h
deleted file mode 100644 (file)
index b4ec95f..0000000
--- a/arch/c6x/include/asm/prom.h
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy prom.h; here to make linux/of.h's #includes happy */