summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-05-16 11:29:50 +0400
committerKukjin Kim <kgene.kim@samsung.com>2011-05-16 11:29:50 +0400
commitbd6356bdafc853201168f718f0059fbe11191461 (patch)
treee2f82e8950b0201ab93c8fa8ff07ac31ba1c2a35 /Documentation
parent3185847957d4834d1b30b253b1c71bb05bad7265 (diff)
parent4b42120df72aeebd3967c952804cb1af53b91cc5 (diff)
downloadlinux-bd6356bdafc853201168f718f0059fbe11191461.tar.xz
Merge branch 'dev/removing-s5p6442' into for-next
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/arm/Samsung/Overview.txt2
-rw-r--r--Documentation/flexible-arrays.txt4
2 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/arm/Samsung/Overview.txt b/Documentation/arm/Samsung/Overview.txt
index c3094ea51aa7..658abb258cef 100644
--- a/Documentation/arm/Samsung/Overview.txt
+++ b/Documentation/arm/Samsung/Overview.txt
@@ -14,7 +14,6 @@ Introduction
- S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list
- S3C64XX: S3C6400 and S3C6410
- S5P6440
- - S5P6442
- S5PC100
- S5PC110 / S5PV210
@@ -36,7 +35,6 @@ Configuration
unifying all the SoCs into one kernel.
s5p6440_defconfig - S5P6440 specific default configuration
- s5p6442_defconfig - S5P6442 specific default configuration
s5pc100_defconfig - S5PC100 specific default configuration
s5pc110_defconfig - S5PC110 specific default configuration
s5pv210_defconfig - S5PV210 specific default configuration
diff --git a/Documentation/flexible-arrays.txt b/Documentation/flexible-arrays.txt
index cb8a3a00cc92..df904aec9904 100644
--- a/Documentation/flexible-arrays.txt
+++ b/Documentation/flexible-arrays.txt
@@ -66,10 +66,10 @@ trick is to ensure that any needed memory allocations are done before
entering atomic context, using:
int flex_array_prealloc(struct flex_array *array, unsigned int start,
- unsigned int end, gfp_t flags);
+ unsigned int nr_elements, gfp_t flags);
This function will ensure that memory for the elements indexed in the range
-defined by start and end has been allocated. Thereafter, a
+defined by start and nr_elements has been allocated. Thereafter, a
flex_array_put() call on an element in that range is guaranteed not to
block.