Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[linux.git] / scripts / .gitignore

diff --git a/scripts/.gitignore b/scripts/.gitignore
index 306054ef340f73466c17b945bc8bdb038bd2218b..ef45f96cd7a518ffd456c194362cf4d72fb96015 100644 (file)
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -2,7 +2,6 @@
 # Generated files
 #
 bin2c
-conmakehash
 kallsyms
 unifdef
 recordmcount