diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 20:06:39 +0200 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 20:06:39 +0200 |
commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /Documentation/arm/Samsung-S3C24XX/S3C2413.txt | |
parent | [SCSI] atp870u: reduce huge stack usage (diff) | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | linux-f28e71617ddaf2483e3e5c5237103484a303743f.tar.xz linux-f28e71617ddaf2483e3e5c5237103484a303743f.zip |
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 @@ + S3C2413 ARM Linux Overview + ========================== + +Introduction +------------ + + The S3C2413 is an extended version of the S3C2412, with an camera + interface and mobile DDR memory support. See the S3C2412 support + documentation for more information. + + +Camera Interface +--------------- + + This block is currently not supported. + + +Document Author +--------------- + +Ben Dooks, (c) 2006 Simtec Electronics |