diff --git a/[refs] b/[refs] index 1f966dfa6e75..58e3bff4c321 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 181fdde3b4268cb7b4af76ba6337e7ec8accbb36 +refs/heads/master: 8a6d9b149f105f8bdfa8e42dd9753e45a1887a16 diff --git a/trunk/include/linux/i2o.h b/trunk/include/linux/i2o.h index 87018dc5527d..9e7a12d6385d 100644 --- a/trunk/include/linux/i2o.h +++ b/trunk/include/linux/i2o.h @@ -782,7 +782,6 @@ extern int i2o_exec_lct_get(struct i2o_controller *); #define to_i2o_driver(drv) container_of(drv,struct i2o_driver, driver) #define to_i2o_device(dev) container_of(dev, struct i2o_device, device) #define to_i2o_controller(dev) container_of(dev, struct i2o_controller, device) -#define kobj_to_i2o_device(kobj) to_i2o_device(container_of(kobj, struct device, kobj)) /** * i2o_out_to_virt - Turn an I2O message to a virtual address