From 52f09301af2dcb34fd353fff08b6b341ebd73239 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 3 Jan 2009 15:01:08 +0000 Subject: [PATCH] fix compiler warnings in the m25p80 driver on 2.6.28 SVN-Revision: 13838 --- .../103-mtd_m25p80_add_en25p32_support.patch | 2 +- .../105-mtd_m25p80_add_mx25lxxx_support.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25p32_support.patch b/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25p32_support.patch index 4d40070c4a..be4016c76b 100644 --- a/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25p32_support.patch +++ b/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25p32_support.patch @@ -5,7 +5,7 @@ { "at26df321", 0x1f4701, 0, 64 * 1024, 64, SECT_4K, }, + /* EON -- en25px */ -+ { "en25p32", 0x1c2016, 64 * 1024, 64, }, ++ { "en25p32", 0x1c2016, 0, 64 * 1024, 64, }, + /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ { "pm25lv512", 0, 32 * 1024, 2, SECT_4K }, diff --git a/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch b/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch index 2a4930e87f..61a3201024 100644 --- a/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch +++ b/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch @@ -2,12 +2,12 @@ +++ b/drivers/mtd/devices/m25p80.c @@ -506,6 +506,11 @@ static struct flash_info __devinitdata m /* EON -- en25px */ - { "en25p32", 0x1c2016, 64 * 1024, 64, }, + { "en25p32", 0x1c2016, 0, 64 * 1024, 64, }, + /* Macronix -- mx25lxxx */ -+ { "mx25l32", 0xc22016, 64 * 1024, 64, }, -+ { "mx25l64", 0xc22017, 64 * 1024, 128, }, -+ { "mx25l128", 0xc22018, 64 * 1024, 256, }, ++ { "mx25l32", 0xc22016, 0, 64 * 1024, 64, }, ++ { "mx25l64", 0xc22017, 0, 64 * 1024, 128, }, ++ { "mx25l128", 0xc22018, 0, 64 * 1024, 256, }, + /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ { "pm25lv512", 0, 32 * 1024, 2, SECT_4K }, -- 2.30.2