Merge ../linus

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / cpqphp_sysfs.c

diff --git a/drivers/pci/hotplug/cpqphp_sysfs.c b/drivers/pci/hotplug/cpqphp_sysfs.c
index 8b3da007e859abc803a9109ba046ba31e6be432c..634f74d919d3d1c8fbc9e0bc5dadc99d5bb5d5b5 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_sysfs.c
+++ b/drivers/pci/hotplug/cpqphp_sysfs.c
@@ -32,6 +32,7 @@
 #include <linux/proc_fs.h>
 #include <linux/workqueue.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/debugfs.h>
 #include "cpqphp.h"
 
@@ -140,7 +141,7 @@ struct ctrl_dbg {
 
 static int open(struct inode *inode, struct file *file)
 {
-       struct controller *ctrl = inode->u.generic_ip;
+       struct controller *ctrl = inode->i_private;
        struct ctrl_dbg *dbg;
        int retval = -ENOMEM;