Merge branch 'fix/misc' into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / i2o.h

diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index 4c4e57d1f19d74c245c7e70e09c5e9428f838089..9e7a12d6385d73f4115bc7528aa30926bdc2005b 100644 (file)
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -385,7 +385,7 @@
 /* defines for max_sectors and max_phys_segments */
 #define I2O_MAX_SECTORS                        1024
 #define I2O_MAX_SECTORS_LIMITED                128
-#define I2O_MAX_PHYS_SEGMENTS          MAX_PHYS_SEGMENTS
+#define I2O_MAX_PHYS_SEGMENTS          BLK_MAX_SEGMENTS
 
 /*
  *     Message structures
@@ -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