diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 22:08:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 22:08:13 -0400 |
| commit | 4b8447184ae85de4ce710e5f561fbaada21b8394 (patch) | |
| tree | 71aed2c654a6d8d83beff480bc84d9e63b366858 /drivers | |
| parent | a43cdf08a1b1ab3c013059b5fa4c1b7561e53cb7 (diff) | |
| parent | 1604f31895dcdb42edf6511ce7ef0546ff92c8e5 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/sba_iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 294c1117098d..f1e7ccd5475b 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
| @@ -1320,12 +1320,12 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num) | |||
| 1320 | ** the GART code to handshake on. | 1320 | ** the GART code to handshake on. |
| 1321 | */ | 1321 | */ |
| 1322 | klist_iter_init(&sba->dev.klist_children, &i); | 1322 | klist_iter_init(&sba->dev.klist_children, &i); |
| 1323 | while (dev = next_device(&i)) { | 1323 | while ((dev = next_device(&i))) { |
| 1324 | struct parisc_device *lba = to_parisc_device(dev); | 1324 | struct parisc_device *lba = to_parisc_device(dev); |
| 1325 | if (IS_QUICKSILVER(lba)) | 1325 | if (IS_QUICKSILVER(lba)) |
| 1326 | agp_found = 1; | 1326 | agp_found = 1; |
| 1327 | } | 1327 | } |
| 1328 | klist_iter_exit(&sba->dev.klist_children, &i); | 1328 | klist_iter_exit(&i); |
| 1329 | 1329 | ||
| 1330 | if (agp_found && sba_reserve_agpgart) { | 1330 | if (agp_found && sba_reserve_agpgart) { |
| 1331 | printk(KERN_INFO "%s: reserving %dMb of IOVA space for agpgart\n", | 1331 | printk(KERN_INFO "%s: reserving %dMb of IOVA space for agpgart\n", |