diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /Documentation/arm/Samsung-S3C24XX/S3C2413.txt | |
parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'Documentation/arm/Samsung-S3C24XX/S3C2413.txt')
-rw-r--r-- | Documentation/arm/Samsung-S3C24XX/S3C2413.txt | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/S3C2413.txt b/Documentation/arm/Samsung-S3C24XX/S3C2413.txt new file mode 100644 index 000000000000..ab2a88858f12 --- /dev/null +++ b/Documentation/arm/Samsung-S3C24XX/S3C2413.txt | |||
@@ -0,0 +1,21 @@ | |||
1 | S3C2413 ARM Linux Overview | ||
2 | ========================== | ||
3 | |||
4 | Introduction | ||
5 | ------------ | ||
6 | |||
7 | The S3C2413 is an extended version of the S3C2412, with an camera | ||
8 | interface and mobile DDR memory support. See the S3C2412 support | ||
9 | documentation for more information. | ||
10 | |||
11 | |||
12 | Camera Interface | ||
13 | --------------- | ||
14 | |||
15 | This block is currently not supported. | ||
16 | |||
17 | |||
18 | Document Author | ||
19 | --------------- | ||
20 | |||
21 | Ben Dooks, (c) 2006 Simtec Electronics | ||