[lkml]   [2012]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the arm-soc tree with the sound-asoc tree
    Hi all,

    Today's linux-next merge of the arm-soc tree got a conflict in
    arch/arm/mach-imx/mach-imx27_visstrim_m10.c between commit 5ec65ee589fd
    ("ASoC: mx27vis-aic32x4: Convert it to platform driver") from the
    sound-asoc tree and commit f52f5a5503b5 ("i.MX27: visstrim_m10: Add video
    support") from the arm-soc tree.

    I fixed it up (see below) and can carry the fix as necessary.
    Stephen Rothwell

    diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
    index 428459f,0a1643c..0000000
    --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
    +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
    @@@ -263,7 -393,10 +393,11 @@@ static void __init visstrim_m10_board_i
    platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
    + platform_device_register_resndata(NULL, "soc-camera-pdrv", 0, NULL, 0,
    + &iclink_tvp5150, sizeof(iclink_tvp5150));
    + gpio_led_register_device(0, &visstrim_m10_led_data);
    + visstrim_camera_init();
    + imx_add_platform_device("mx27vis", 0, NULL, 0, NULL, 0);

    static void __init visstrim_m10_timer_init(void)
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2012-03-14 07:09    [W:0.018 / U:8.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site