diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 16:33:01 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 16:33:01 -0500 |
| commit | f18ea8276bc6b0f8584c442905e9badc2acc8785 (patch) | |
| tree | f71e3f05420f35f7eaf838d93fb83d665aedcac4 /arch/arm/plat-s3c/include | |
| parent | 3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5 (diff) | |
| parent | 1a71e4ade19d51bab03b6837d4d33a953e4e1206 (diff) | |
ARM: Merge next-s3c24xx-dev-rtp
Merge branch 'next-s3c24xx-dev-rtp' into for-rmk
Conflicts:
arch/arm/mach-s3c2440/mach-anubis.c
Diffstat (limited to 'arch/arm/plat-s3c/include')
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/nand.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/include/plat/nand.h b/arch/arm/plat-s3c/include/plat/nand.h index 18f958801e64..065985978413 100644 --- a/arch/arm/plat-s3c/include/plat/nand.h +++ b/arch/arm/plat-s3c/include/plat/nand.h | |||
| @@ -55,3 +55,11 @@ struct s3c2410_platform_nand { | |||
| 55 | int chip); | 55 | int chip); |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | /** | ||
| 59 | * s3c_nand_set_platdata() - register NAND platform data. | ||
| 60 | * @nand: The NAND platform data to register with s3c_device_nand. | ||
| 61 | * | ||
| 62 | * This function copies the given NAND platform data, @nand and registers | ||
| 63 | * it with the s3c_device_nand. This allows @nand to be __initdata. | ||
| 64 | */ | ||
| 65 | extern void s3c_nand_set_platdata(struct s3c2410_platform_nand *nand); | ||