From: Adrian Bunk After the i2c-isa removal some code can become static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- drivers/i2c/i2c-core.c | 7 +++---- include/linux/i2c.h | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff -puN drivers/i2c/i2c-core.c~drivers-i2c-i2c-corec-make-code-static drivers/i2c/i2c-core.c --- a/drivers/i2c/i2c-core.c~drivers-i2c-i2c-corec-make-code-static +++ a/drivers/i2c/i2c-core.c @@ -190,7 +190,7 @@ static struct device_attribute i2c_dev_a { }, }; -struct bus_type i2c_bus_type = { +static struct bus_type i2c_bus_type = { .name = "i2c", .dev_attrs = i2c_dev_attrs, .match = i2c_device_match, @@ -201,7 +201,6 @@ struct bus_type i2c_bus_type = { .suspend = i2c_device_suspend, .resume = i2c_device_resume, }; -EXPORT_SYMBOL_GPL(i2c_bus_type); /** * i2c_new_device - instantiate an i2c device for use with a new style driver @@ -285,7 +284,7 @@ EXPORT_SYMBOL_GPL(i2c_unregister_device) /* I2C bus adapters -- one roots each I2C or SMBUS segment */ -void i2c_adapter_dev_release(struct device *dev) +static void i2c_adapter_dev_release(struct device *dev) { struct i2c_adapter *adap = to_i2c_adapter(dev); complete(&adap->dev_released); @@ -303,7 +302,7 @@ static struct device_attribute i2c_adapt { }, }; -struct class i2c_adapter_class = { +static struct class i2c_adapter_class = { .owner = THIS_MODULE, .name = "i2c-adapter", .dev_attrs = i2c_adapter_attrs, diff -puN include/linux/i2c.h~drivers-i2c-i2c-corec-make-code-static include/linux/i2c.h --- a/include/linux/i2c.h~drivers-i2c-i2c-corec-make-code-static +++ a/include/linux/i2c.h @@ -35,8 +35,6 @@ #include /* for completion */ #include -extern struct bus_type i2c_bus_type; - /* --- General options ------------------------------------------------ */ struct i2c_msg; _