summaryrefslogtreecommitdiffstats
path: root/drivers/bcma
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-02-01 13:43:25 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-02-01 13:43:25 -0500
commited6882ac40552034ae6bde3e540b84c832dc8491 (patch)
tree989f14b7cee32d55f28b87c3610ffd41cefc8825 /drivers/bcma
parent66555e92fb7a619188c02cceae4bbc414f15f96d (diff)
parent8a7d7cbf7b5ff9912ef50b3e94c9ad9f37b1c75f (diff)
downloadop-kernel-dev-ed6882ac40552034ae6bde3e540b84c832dc8491.zip
op-kernel-dev-ed6882ac40552034ae6bde3e540b84c832dc8491.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bcma/driver_chipcommon_nflash.c b/drivers/bcma/driver_chipcommon_nflash.c
index dbda91e..1f0b83e 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;
}
OpenPOWER on IntegriCloud