On 3/31/2012 12:15 AM, Stephen Warren wrote: >> > diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c > ... >> > #else >> > -static inline struct tegra_kbc_platform_data *tegra_kbc_dt_parse_pdata( >> > - struct platform_device *pdev) >> > +static struct tegra_kbc_platform_data * __devinit >> > +tegra_kbc_dt_parse_pdata(struct device_node *np) > This one should be "inline" and not "__devinit", i.e. like it was before. > >> > diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h > ... >> > #else >> > -static inline struct matrix_keymap_data * >> > -matrix_keyboard_of_fill_keymap(struct device_node *np, const char *propname) >> > +int matrix_keypad_of_build_keymap(struct input_dev *idev, >> > + unsigned int row_shift, const char *propname) >> > { >> > return NULL; >> > } > This one should also be "static inline". Would send fixup/incremental patch for this. -- viresh -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html