aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-gd.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-28 15:36:58 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-28 15:36:58 -0800
commit18963caaf55240d6a0491bdb27b7fef2882ffb15 (patch)
treed0e4365cae0ce401ba826809f4eef0bd755f4f2d /drivers/ide/ide-gd.h
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff)
downloadlinux-dev-18963caaf55240d6a0491bdb27b7fef2882ffb15.tar.xz
linux-dev-18963caaf55240d6a0491bdb27b7fef2882ffb15.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/ide/ide-gd.h')
-rw-r--r--drivers/ide/ide-gd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-gd.h b/drivers/ide/ide-gd.h
index a86779f0756b..b604bdd318a1 100644
--- a/drivers/ide/ide-gd.h
+++ b/drivers/ide/ide-gd.h
@@ -17,7 +17,7 @@ struct ide_disk_obj {
ide_drive_t *drive;
struct ide_driver *driver;
struct gendisk *disk;
- struct kref kref;
+ struct device dev;
unsigned int openers; /* protected by BKL for now */
/* Last failed packet command */