mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge 3.3-rc2 into the driver-core-next branch.
This was done to resolve a merge and build problem with the drivers/acpi/processor_driver.c file. Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
bd1d462e13
586 changed files with 5488 additions and 8308 deletions
|
|
@ -205,7 +205,8 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev)
|
|||
|
||||
dev_set_drvdata(&dev->dev, NULL);
|
||||
|
||||
for (; next = s->next, s; s = next) {
|
||||
for (; s; s = next) {
|
||||
next = s->next;
|
||||
soc_pcmcia_remove_one(&s->soc);
|
||||
kfree(s);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue