Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[~andy/linux] / drivers / eisa / virtual_root.c

diff --git a/drivers/eisa/virtual_root.c b/drivers/eisa/virtual_root.c
index 15677f20bd85bd9208a41610eea9a2b7b6e70ee3..9b4fcac03ad5fee8a87922ffd9c2cab2525ffda3 100644 (file)
--- a/drivers/eisa/virtual_root.c
+++ b/drivers/eisa/virtual_root.c
@@ -7,9 +7,8 @@
  * This code is released under the GPL version 2.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/eisa.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>