diff --git a/[refs] b/[refs] index 961acc18d347..bde407d39797 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17e86d3879d589fce4c457bfb9a2029f883fb2cb +refs/heads/master: 7569fc5463cb212ac166d13187527f0338c27316 diff --git a/trunk/arch/arm/mach-s3c64xx/dev-onenand1.c b/trunk/arch/arm/mach-s3c64xx/dev-onenand1.c index 92ffd5bac104..999f9e17a1e4 100644 --- a/trunk/arch/arm/mach-s3c64xx/dev-onenand1.c +++ b/trunk/arch/arm/mach-s3c64xx/dev-onenand1.c @@ -19,6 +19,8 @@ #include #include +#include + static struct resource s3c64xx_onenand1_resources[] = { [0] = { .start = S3C64XX_PA_ONENAND1, @@ -46,10 +48,6 @@ struct platform_device s3c64xx_device_onenand1 = { void s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata) { - struct onenand_platform_data *pd; - - pd = kmemdup(pdata, sizeof(struct onenand_platform_data), GFP_KERNEL); - if (!pd) - printk(KERN_ERR "%s: no memory for platform data\n", __func__); - s3c64xx_device_onenand1.dev.platform_data = pd; + s3c_set_platdata(pdata, sizeof(struct onenand_platform_data), + &s3c64xx_device_onenand1); }