Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[safe/jmp/linux-2.6] / include / linux / phonedev.h

diff --git a/include/linux/phonedev.h b/include/linux/phonedev.h
index d54049e..a0e31ad 100644 (file)
--- a/include/linux/phonedev.h
+++ b/include/linux/phonedev.h
@@ -2,7 +2,6 @@
 #define __LINUX_PHONEDEV_H
 
 #include <linux/types.h>
-#include <linux/version.h>
 
 #ifdef __KERNEL__