Hi,
* Rajendra Nayak <rnayak@xxxxxx> [091214 01:11]:
> Fixes a couple of implicit function definition errors
> for functions defined only for omap3 and called in omap2/3
> common code, and one function argument mismatch.
Looks like this needs to be refreshed to apply. Also
please fix the few cosmetic issues below :)
> Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
> ---
> arch/arm/mach-omap2/board-2430sdp.c | 2 +-
> arch/arm/mach-omap2/serial.c | 1 +
> arch/arm/plat-omap/i2c.c | 2 ++
> 3 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
> index db9374b..dea1425 100644
> --- a/arch/arm/mach-omap2/board-2430sdp.c
> +++ b/arch/arm/mach-omap2/board-2430sdp.c
> @@ -147,7 +147,7 @@ static void __init omap_2430sdp_init_irq(void)
> {
> omap_board_config = sdp2430_config;
> omap_board_config_size = ARRAY_SIZE(sdp2430_config);
> - omap2_init_common_hw(NULL, NULL);
> + omap2_init_common_hw(NULL, NULL, NULL, NULL, NULL);
> omap_init_irq();
> omap_gpio_init();
> }
> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
> index c067416..5c65d2d 100644
> --- a/arch/arm/mach-omap2/serial.c
> +++ b/arch/arm/mach-omap2/serial.c
> @@ -500,6 +500,7 @@ DEVICE_ATTR(sleep_timeout, 0644, sleep_timeout_show, sleep_timeout_store);
> #define DEV_CREATE_FILE(dev, attr) WARN_ON(device_create_file(dev, attr))
> #else
> static inline void omap_uart_idle_init(struct omap_uart_state *uart) {}
> +static inline void omap_uart_block_sleep(struct omap_uart_state *uart){}
Should be like this for new entries:
static inline void omap_uart_block_sleep(struct omap_uart_state *uart)
{
}
Maybe also update the omap_uart_idle_init the same way?
> diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
> index fb447c1..f8eb3a0 100644
> --- a/arch/arm/plat-omap/i2c.c
> +++ b/arch/arm/plat-omap/i2c.c
> @@ -117,6 +117,8 @@ static void omap_i2c_set_wfc_mpu_wkup_lat(struct device *dev, int val)
> {
> omap_pm_set_max_mpu_wakeup_lat(dev, val);
> }
> +#else
> +static inline void omap_i2c_set_wfc_mpu_wkup_lat(struct device *dev, int val){}
> #endif
Here too.
Regards,
Tony
--
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
