Commit 41340965 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

Merge branch 'ib-iio-i2c-5.13rc1' into togreg 

Adds a stub needed to resolve a build conflict for the
fxls8962af driver.
parents 9654c414 aa5c8b25

include/linux/i2c.h

+7 −1
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ struct i2c_client { 
};

#define to_i2c_client(d) container_of(d, struct i2c_client, dev)



struct i2c_client *i2c_verify_client(struct device *dev);

struct i2c_adapter *i2c_verify_adapter(struct device *dev);

const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,

					 const struct i2c_client *client);
@@ -477,6 +476,13 @@ i2c_new_ancillary_device(struct i2c_client *client, 
			 u16 default_addr);



void i2c_unregister_device(struct i2c_client *client);



struct i2c_client *i2c_verify_client(struct device *dev);

#else

static inline struct i2c_client *i2c_verify_client(struct device *dev)

{

	return NULL;

}

#endif /* I2C */



/* Mainboard arch_initcall() code should register all its I2C devices.