projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pm-cpufreq-fixes' and 'pm-cpuidle'
[linux-2.6-block.git]
/
drivers
/
bcma
/
driver_chipcommon_sflash.c
diff --git
a/drivers/bcma/driver_chipcommon_sflash.c
b/drivers/bcma/driver_chipcommon_sflash.c
index 04d706ca5f439be4576c8f78afb4b10a66b5dd3e..35b13a08ca3e6a4f21cd602ecf3d9ab9c328f9f0 100644
(file)
--- a/
drivers/bcma/driver_chipcommon_sflash.c
+++ b/
drivers/bcma/driver_chipcommon_sflash.c
@@
-146,7
+146,6
@@
int bcma_sflash_init(struct bcma_drv_cc *cc)
return -ENOTSUPP;
}
- sflash->window = BCMA_SOC_FLASH2;
sflash->blocksize = e->blocksize;
sflash->numblocks = e->numblocks;
sflash->size = sflash->blocksize * sflash->numblocks;