summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 13:19:17 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 13:19:17 -0800
commit038c068f63a950c3a6ccfa814831ccac0ad48fb1 (patch)
tree29389a8d23dd5e29012ac289920df27ade357857 /drivers
parent5992fd1995a5e69710011fc7d7945c62bf5b551b (diff)
parente41698894d3fe64f17fe411e3e5ef3c2537bf2e6 (diff)
downloadlinux-3.10-038c068f63a950c3a6ccfa814831ccac0ad48fb1.tar.gz
linux-3.10-038c068f63a950c3a6ccfa814831ccac0ad48fb1.tar.bz2
linux-3.10-038c068f63a950c3a6ccfa814831ccac0ad48fb1.zip
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 0ddfd6de75c..5fac4c421a2 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
ecc_code[1] = ecc >> 8;
ecc_code[2] = ecc >> 16;
- pr_debug("%s: returning ecc %06x\n", __func__, ecc);
+ pr_debug("%s: returning ecc %06lx\n", __func__, ecc);
return 0;
}