diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-14 15:51:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-14 15:51:23 +0200 |
| commit | dcc854579059ff9633db4dc41c681371d22f794e (patch) | |
| tree | 985489cf3efcb1fcaa193237fb8674d530c188dd /arch/arm/plat-samsung/dev-onenand.c | |
| parent | usb: renesas_usbhs: add DMAEngine support (diff) | |
| parent | Linux 3.0-rc3 (diff) | |
| download | linux-dcc854579059ff9633db4dc41c681371d22f794e.tar.xz linux-dcc854579059ff9633db4dc41c681371d22f794e.zip | |
Merge 3.0-rc2 into usb-linus as it's needed by some USB patches
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/plat-samsung/dev-onenand.c')
| -rw-r--r-- | arch/arm/plat-samsung/dev-onenand.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/plat-samsung/dev-onenand.c b/arch/arm/plat-samsung/dev-onenand.c index 45ec73287d8c..f54ae71f0cd2 100644 --- a/arch/arm/plat-samsung/dev-onenand.c +++ b/arch/arm/plat-samsung/dev-onenand.c @@ -13,8 +13,6 @@ #include <linux/kernel.h> #include <linux/platform_device.h> -#include <linux/mtd/mtd.h> -#include <linux/mtd/onenand.h> #include <mach/irqs.h> #include <mach/map.h> @@ -43,13 +41,3 @@ struct platform_device s3c_device_onenand = { .num_resources = ARRAY_SIZE(s3c_onenand_resources), .resource = s3c_onenand_resources, }; - -void s3c_onenand_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__); - s3c_device_onenand.dev.platform_data = pd; -} |