| Message ID | 1234948938-6979-1-git-send-email-Aaro.Koskinen@nokia.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Tony Lindgren |
| Headers | show |
On Wed, 18 Feb 2009 11:22:18 +0200 Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote: > Fixes a linker error when OMAP I2C bus driver is compiled as a module: > > ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko] > undefined! > > The I2C utility functions used for board initialization should be > always built-in. > > Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com> > --- > arch/arm/plat-omap/Makefile | 3 ++- > arch/arm/plat-omap/include/mach/common.h | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Jarkko Nikula <jhnikula@gmail.com> [090218 01:42]: > On Wed, 18 Feb 2009 11:22:18 +0200 > Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote: > > > Fixes a linker error when OMAP I2C bus driver is compiled as a module: > > > > ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko] > > undefined! > > > > The I2C utility functions used for board initialization should be > > always built-in. > > > > Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com> > > --- > > arch/arm/plat-omap/Makefile | 3 ++- > > arch/arm/plat-omap/include/mach/common.h | 2 +- > > 2 files changed, 3 insertions(+), 2 deletions(-) > > > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com> Applying to linux-omap and omap-fixes. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 18, 2009 at 03:40:29PM -0800, Tony Lindgren wrote: > * Jarkko Nikula <jhnikula@gmail.com> [090218 01:42]: > > On Wed, 18 Feb 2009 11:22:18 +0200 > > Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote: > > > > > Fixes a linker error when OMAP I2C bus driver is compiled as a module: > > > > > > ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko] > > > undefined! > > > > > > The I2C utility functions used for board initialization should be > > > always built-in. > > > > > > Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com> > > > --- > > > arch/arm/plat-omap/Makefile | 3 ++- > > > arch/arm/plat-omap/include/mach/common.h | 2 +- > > > 2 files changed, 3 insertions(+), 2 deletions(-) > > > > > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com> > > Applying to linux-omap and omap-fixes. Just curious: what about omap-2.6.28? -otto -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Otto Solares <solca@guug.org> [090218 15:43]: > On Wed, Feb 18, 2009 at 03:40:29PM -0800, Tony Lindgren wrote: > > * Jarkko Nikula <jhnikula@gmail.com> [090218 01:42]: > > > On Wed, 18 Feb 2009 11:22:18 +0200 > > > Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote: > > > > > > > Fixes a linker error when OMAP I2C bus driver is compiled as a module: > > > > > > > > ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko] > > > > undefined! > > > > > > > > The I2C utility functions used for board initialization should be > > > > always built-in. > > > > > > > > Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com> > > > > --- > > > > arch/arm/plat-omap/Makefile | 3 ++- > > > > arch/arm/plat-omap/include/mach/common.h | 2 +- > > > > 2 files changed, 3 insertions(+), 2 deletions(-) > > > > > > > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com> > > > > Applying to linux-omap and omap-fixes. > > Just curious: what about omap-2.6.28? Heh, OK pushed there too :) I think we should close that branch soon as 2.6.29 is fast approaching.. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 18, 2009 at 03:59:56PM -0800, Tony Lindgren wrote: > * Otto Solares <solca@guug.org> [090218 15:43]: > > On Wed, Feb 18, 2009 at 03:40:29PM -0800, Tony Lindgren wrote: > > > * Jarkko Nikula <jhnikula@gmail.com> [090218 01:42]: > > > > On Wed, 18 Feb 2009 11:22:18 +0200 > > > > Aaro Koskinen <Aaro.Koskinen@nokia.com> wrote: > > > > > > > > > Fixes a linker error when OMAP I2C bus driver is compiled as a module: > > > > > > > > > > ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko] > > > > > undefined! > > > > > > > > > > The I2C utility functions used for board initialization should be > > > > > always built-in. > > > > > > > > > > Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com> > > > > > --- > > > > > arch/arm/plat-omap/Makefile | 3 ++- > > > > > arch/arm/plat-omap/include/mach/common.h | 2 +- > > > > > 2 files changed, 3 insertions(+), 2 deletions(-) > > > > > > > > > Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com> > > > > > > Applying to linux-omap and omap-fixes. > > > > Just curious: what about omap-2.6.28? > > Heh, OK pushed there too :) I think we should close that branch soon > as 2.6.29 is fast approaching.. It would be nice to have some bugfixing branch for stable kernels IMO ;) -otto -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index b3f0e6b..3ebc09e 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -21,7 +21,8 @@ obj-$(CONFIG_OMAP_COMPONENT_VERSION) += component-version.o obj-$(CONFIG_OMAP_GPIO_SWITCH) += gpio-switch.o obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o -obj-$(CONFIG_I2C_OMAP) += i2c.o +i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o +obj-y += $(i2c-omap-m) $(i2c-omap-y) # OMAP mailbox framework obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o diff --git a/arch/arm/plat-omap/include/mach/common.h b/arch/arm/plat-omap/include/mach/common.h index af4105f..8c1b965 100644 --- a/arch/arm/plat-omap/include/mach/common.h +++ b/arch/arm/plat-omap/include/mach/common.h @@ -33,7 +33,7 @@ struct sys_timer; extern void omap_map_common_io(void); extern struct sys_timer omap_timer; -#ifdef CONFIG_I2C_OMAP +#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) extern int omap_register_i2c_bus(int bus_id, u32 clkrate, struct i2c_board_info const *info, unsigned len);
Fixes a linker error when OMAP I2C bus driver is compiled as a module: ERROR: "i2c_register_board_info" [arch/arm/plat-omap/i2c.ko] undefined! The I2C utility functions used for board initialization should be always built-in. Signed-off-by: Aaro Koskinen <Aaro.Koskinen@nokia.com> --- arch/arm/plat-omap/Makefile | 3 ++- arch/arm/plat-omap/include/mach/common.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)