Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block

[~andy/linux] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index b88723b81b3d4738dd403f61c59d0685518888c2..4f440b3e89fe7fd7e47ead6c6ed911f173205431 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -16,7 +16,6 @@
 
 #ifdef CONFIG_BLOCK
 
-#define kobj_to_dev(k)         container_of((k), struct device, kobj)
 #define dev_to_disk(device)    container_of((device), struct gendisk, part0.__dev)
 #define dev_to_part(device)    container_of((device), struct hd_struct, __dev)
 #define disk_to_dev(disk)      (&(disk)->part0.__dev)