mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6: [PA-RISC] Fix time.c for new do_timer() calling convention [PA-RISC] Fix must_check warnings in drivers.c [PA-RISC] Fix parisc_newuname() [PA-RISC] Remove warning from pci.c [PA-RISC] Fix filldir warnings [PA-RISC] Fix sys32_sysctl [PA-RISC] Fix sba_iommu compilation
This commit is contained in:
commit
4b8447184a
7 changed files with 58 additions and 56 deletions
|
|
@ -1320,12 +1320,12 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
|
|||
** the GART code to handshake on.
|
||||
*/
|
||||
klist_iter_init(&sba->dev.klist_children, &i);
|
||||
while (dev = next_device(&i)) {
|
||||
while ((dev = next_device(&i))) {
|
||||
struct parisc_device *lba = to_parisc_device(dev);
|
||||
if (IS_QUICKSILVER(lba))
|
||||
agp_found = 1;
|
||||
}
|
||||
klist_iter_exit(&sba->dev.klist_children, &i);
|
||||
klist_iter_exit(&i);
|
||||
|
||||
if (agp_found && sba_reserve_agpgart) {
|
||||
printk(KERN_INFO "%s: reserving %dMb of IOVA space for agpgart\n",
|
||||
|
|
|
|||
Loading…
Reference in a new issue