On Thu, Dec 09, 2010 at 08:55:28AM -0800, Kevin Hilman wrote: > Ben, > > Benoit Cousson <b-cousson@xxxxxx> writes: > > > The convention for omap device naming is omap_XXX. > > > > Rename the device and driver name in order to stick > > to this naming convention. > > > > Change device name in clock nodes as well. > > > > Signed-off-by: Benoit Cousson <b-cousson@xxxxxx> > > c: Paul Walmsley <paul@xxxxxxxxx> > > Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> > > Cc: Rajendra Nayak <rnayak@xxxxxx> > > Cc: Ben Dooks <ben-i2c@xxxxxxxxx> Acked-by: Ben Dooks <ben-linux@xxxxxxxxx> > > --- > > arch/arm/mach-omap1/clock_data.c | 6 +++--- > > arch/arm/mach-omap2/clock2420_data.c | 8 ++++---- > > arch/arm/mach-omap2/clock2430_data.c | 8 ++++---- > > arch/arm/mach-omap2/clock3xxx_data.c | 12 ++++++------ > > arch/arm/mach-omap2/clock44xx_data.c | 16 ++++++++-------- > > arch/arm/plat-omap/i2c.c | 2 +- > > drivers/i2c/busses/i2c-omap.c | 4 ++-- > > 7 files changed, 28 insertions(+), 28 deletions(-) > > [...] > > > diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c > > index 760b8be..9d09083 100644 > > --- a/drivers/i2c/busses/i2c-omap.c > > +++ b/drivers/i2c/busses/i2c-omap.c > > @@ -1139,7 +1139,7 @@ static struct platform_driver omap_i2c_driver = { > > .probe = omap_i2c_probe, > > .remove = omap_i2c_remove, > > .driver = { > > - .name = "i2c_omap", > > + .name = "omap_i2c", > > .owner = THIS_MODULE, > > }, > > }; > > @@ -1161,4 +1161,4 @@ module_exit(omap_i2c_exit_driver); > > MODULE_AUTHOR("MontaVista Software, Inc. (and others)"); > > MODULE_DESCRIPTION("TI OMAP I2C bus adapter"); > > MODULE_LICENSE("GPL"); > > -MODULE_ALIAS("platform:i2c_omap"); > > +MODULE_ALIAS("platform:omap_i2c"); > > With your ack for the name change in the driver, we can merge this > through the OMAP tree with the other core changes. > > Thanks, > > Kevin > -- -- Ben Dooks, ben@xxxxxxxxx, http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html