linux/pci_ids.h just had a check-in which caused a big merge conflict with my patch. I have tried to sort it out.
Please check Radeon PCI IDs and chip families in radeonfb driver. It is important that the PCI IDs of secondary devices be marked as such. This patch merges Rage128 and Radeon changes into a single patch. It is against current 2.5 bk r1.1188. ===== Jon Smirl [EMAIL PROTECTED] __________________________________ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com
ati.patch
Description: ati.patch
