Merge tag 'v3.6-rc4' into asoc-omap

Linux 3.6-rc4
This commit is contained in:
Mark Brown
2012-09-05 13:04:34 +08:00
1063 changed files with 12128 additions and 7958 deletions

View File

@@ -67,6 +67,7 @@ void __init omap_pmic_init(int bus, u32 clkrate,
const char *pmic_type, int pmic_irq,
struct twl4030_platform_data *pmic_data)
{
omap_mux_init_signal("sys_nirq", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE);
strncpy(pmic_i2c_board_info.type, pmic_type,
sizeof(pmic_i2c_board_info.type));
pmic_i2c_board_info.irq = pmic_irq;