diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 16:19:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 16:19:17 -0500 |
| commit | 038c068f63a950c3a6ccfa814831ccac0ad48fb1 (patch) | |
| tree | 29389a8d23dd5e29012ac289920df27ade357857 /drivers | |
| parent | 5992fd1995a5e69710011fc7d7945c62bf5b551b (diff) | |
| parent | e41698894d3fe64f17fe411e3e5ef3c2537bf2e6 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] CLPS7500 doesn't have IO ports
[ARM] Fix more apm-emulation.h
[ARM] 4234/1: Introduce get_irqnr_preamble and arch_ret_to_user for ns9xxx.
[ARM] 4233/1: nand/s3c2410.c: warning fix
[ARM] 4226/1: initial .data and .bss mappings of XIP kernel should be TEXT_OFFSET
[ARM] 4224/2: allow XIP kernel to boot again
[ARM] 4232/1: AT91: Generic GPIO bug
[ARM] 4231/1: AT91: Merge and typo fixes.
[ARM] 4229/1: S3C2410: Add MACH_QT2410 to s3c2410_defconfig
[ARM] 4228/2: S3C24XX: update s3c2410_defconfig for 2.6.21-rc1
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/s3c2410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 0ddfd6de75c5..5fac4c421a20 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
| @@ -473,7 +473,7 @@ static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u | |||
| 473 | ecc_code[1] = ecc >> 8; | 473 | ecc_code[1] = ecc >> 8; |
| 474 | ecc_code[2] = ecc >> 16; | 474 | ecc_code[2] = ecc >> 16; |
| 475 | 475 | ||
| 476 | pr_debug("%s: returning ecc %06x\n", __func__, ecc); | 476 | pr_debug("%s: returning ecc %06lx\n", __func__, ecc); |
| 477 | 477 | ||
| 478 | return 0; | 478 | return 0; |
| 479 | } | 479 | } |