mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
This commit is contained in:
commit
e70049b9e7
380 changed files with 10888 additions and 2120 deletions
|
|
@ -901,7 +901,7 @@ static int __devinit eeprom_read(struct lanai_dev *lanai)
|
|||
clock_l(); udelay(5);
|
||||
for (i = 128; i != 0; i >>= 1) { /* write command out */
|
||||
tmp = (lanai->conf1 & ~CONFIG1_PROMDATA) |
|
||||
(data & i) ? CONFIG1_PROMDATA : 0;
|
||||
((data & i) ? CONFIG1_PROMDATA : 0);
|
||||
if (lanai->conf1 != tmp) {
|
||||
set_config1(tmp);
|
||||
udelay(5); /* Let new data settle */
|
||||
|
|
|
|||
Loading…
Reference in a new issue