Mokoptach series doesn't apply

Andy Green andy at openmoko.com
Sat Feb 23 13:45:57 CET 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Using the series that is in there at the moment I get...

...
Importing patches-2.6.24-rc4-svn/s3c_mci-gta01.patch
patching file arch/arm/mach-s3c2410/mach-gta01.c
Hunk #3 FAILED at 652.
1 out of 3 hunks FAILED -- saving rejects to file
arch/arm/mach-s3c2410/mach-gta01.c.rej
Failed, halting series import


***************
*** 598,607 ****
            system_rev == GTA01Bv3_SYSTEM_REV ||
            system_rev == GTA01Bv4_SYSTEM_REV) {
                gta01_udc_cfg.udc_command = gta01_udc_command;
        }

        s3c_device_usb.dev.platform_data = &gta01_usb_info;
        s3c_device_nand.dev.platform_data = &gta01_nand_info;

        s3c24xx_fb_set_platdata(&gta01_lcd_cfg);

- --- 652,663 ----
            system_rev == GTA01Bv3_SYSTEM_REV ||
            system_rev == GTA01Bv4_SYSTEM_REV) {
                gta01_udc_cfg.udc_command = gta01_udc_command;
+               gta01_mmc_cfg.ocr_avail = MMC_VDD_32_33;
        }

        s3c_device_usb.dev.platform_data = &gta01_usb_info;
        s3c_device_nand.dev.platform_data = &gta01_nand_info;
+       s3c_device_sdi.dev.platform_data = &gta01_mmc_cfg;

        s3c24xx_fb_set_platdata(&gta01_lcd_cfg);

- -Andy
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFHwBWFOjLpvpq7dMoRAhuIAJ0ShxgdpdFLMsciBofh5XMR2CV99gCbBkJo
a1qOnMvSTXSGXfIvUdYyppI=
=mQii
-----END PGP SIGNATURE-----




More information about the openmoko-kernel mailing list