diff --git a/[refs] b/[refs] index 62e8d8cae4f8..d7729d310421 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cb4734232e62ee95c1f7dafdc032b652eef49d7 +refs/heads/master: 481ea5a16aaabe2570d56b5a4d29fa80adc8008b diff --git a/trunk/arch/arm/mach-pxa/tosa.c b/trunk/arch/arm/mach-pxa/tosa.c index 7d35f9ef8567..df65e89d1934 100644 --- a/trunk/arch/arm/mach-pxa/tosa.c +++ b/trunk/arch/arm/mach-pxa/tosa.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -416,6 +417,7 @@ static void __init tosa_init(void) pxa_set_mci_info(&tosa_mci_platform_data); pxa_set_udc_info(&udc_info); pxa_set_ficp_info(&tosa_ficp_platform_data); + pxa_set_i2c_info(NULL); platform_scoop_config = &tosa_pcmcia_config; platform_add_devices(devices, ARRAY_SIZE(devices));