projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[cascardo/linux.git]
/
drivers
/
ide
/
ide-gd.h
diff --git
a/drivers/ide/ide-gd.h
b/drivers/ide/ide-gd.h
index
a86779f
..
b604bdd
100644
(file)
--- 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 */