summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2012-12-25 22:34:22 +0100
committerJohn W. Linville <linville@tuxdriver.com>2013-01-02 20:38:27 +0100
commit4dd6ff72c4ffde97f1663848a40f49fdf235c913 (patch)
tree83151be713c1ecaa4eac56161a9d949c3d5b1969 /drivers
parentbrcmsmac: Use udelay instead of usleep_range (diff)
downloadlinux-4dd6ff72c4ffde97f1663848a40f49fdf235c913.tar.xz
linux-4dd6ff72c4ffde97f1663848a40f49fdf235c913.zip
bcma: correct M25P32 serial flash ID
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bcma/driver_chipcommon_sflash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bcma/driver_chipcommon_sflash.c b/drivers/bcma/driver_chipcommon_sflash.c
index 63e688393825..1e694db4532d 100644
--- a/drivers/bcma/driver_chipcommon_sflash.c
+++ b/drivers/bcma/driver_chipcommon_sflash.c
@@ -35,7 +35,7 @@ static struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
{ "M25P40", 0x12, 0x10000, 8, },
{ "M25P16", 0x14, 0x10000, 32, },
- { "M25P32", 0x14, 0x10000, 64, },
+ { "M25P32", 0x15, 0x10000, 64, },
{ "M25P64", 0x16, 0x10000, 128, },
{ "M25FL128", 0x17, 0x10000, 256, },
{ 0 },