diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-02-01 19:43:25 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-02-01 19:43:25 +0100 |
commit | ed6882ac40552034ae6bde3e540b84c832dc8491 (patch) | |
tree | 989f14b7cee32d55f28b87c3610ffd41cefc8825 /drivers/bcma | |
parent | tcp: detect SYN/data drop when F-RTO is disabled (diff) | |
parent | mwifiex: fix incomplete scan in case of IE parsing error (diff) | |
download | linux-ed6882ac40552034ae6bde3e540b84c832dc8491.tar.xz linux-ed6882ac40552034ae6bde3e540b84c832dc8491.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/bcma')
-rw-r--r-- | drivers/bcma/driver_chipcommon_nflash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bcma/driver_chipcommon_nflash.c b/drivers/bcma/driver_chipcommon_nflash.c index dbda91e4dff5..1f0b83e18f68 100644 --- a/drivers/bcma/driver_chipcommon_nflash.c +++ b/drivers/bcma/driver_chipcommon_nflash.c @@ -21,7 +21,7 @@ int bcma_nflash_init(struct bcma_drv_cc *cc) struct bcma_bus *bus = cc->core->bus; if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4706 && - cc->core->id.rev != 0x38) { + cc->core->id.rev != 38) { bcma_err(bus, "NAND flash on unsupported board!\n"); return -ENOTSUPP; } |