Merge ../linus

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / cpqphp.h

diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h
index ea040c32f47dd169e6b4de841bf06b4c90093a63..298ad7f3f4f43aada7d324f97a12d39c082fc37e 100644 (file)
--- a/drivers/pci/hotplug/cpqphp.h
+++ b/drivers/pci/hotplug/cpqphp.h
@@ -28,7 +28,6 @@
 #ifndef _CPQPHP_H
 #define _CPQPHP_H
 
-#include "pci_hotplug.h"
 #include <linux/interrupt.h>
 #include <asm/io.h>            /* for read? and write? functions */
 #include <linux/delay.h>       /* for delays */