On Thu, 8 Jul 2010 15:10:22 +1000 Stephen Rothwell wrote: > Hi all, > > Changes since 20100707: > > The i.MX tree mismerge has been fixed. > > The omap tree gained a conflict (involving serveral files) against the > arm tree. > > ---------------------------------------------------------------------------- Should nouveau depend on PCI? It has build errors when PCI is disabled: drivers/gpu/drm/nouveau/nouveau_bios.c: In function 'load_vbios_pci': drivers/gpu/drm/nouveau/nouveau_bios.c:167: error: implicit declaration of function 'pci_enable_rom' drivers/gpu/drm/nouveau/nouveau_bios.c:171: error: implicit declaration of function 'pci_map_rom' drivers/gpu/drm/nouveau/nouveau_bios.c:171: warning: assignment makes pointer from integer without a cast drivers/gpu/drm/nouveau/nouveau_bios.c:175: error: implicit declaration of function 'pci_unmap_rom' drivers/gpu/drm/nouveau/nouveau_bios.c:178: error: implicit declaration of function 'pci_disable_rom' --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html