Re: [Dri-devel] Kernel tree CVS merge..

2003-08-15 Thread Alan Cox
On Gwe, 2003-08-15 at 01:13, Dave Airlie wrote: > > +config DRM_SIS > > + tristate "SiS video cards" > > + depends on DRM && AGP && FB_SIS > > + help > > + Choose this option if you have a SiS 630 or compatibel video Typo - compaible, also only works with XFree 4.2 > > ---

Re: [Dri-devel] Kernel tree CVS merge..

2003-08-15 Thread Michel Dänzer
On Thu, 2003-08-14 at 22:31, Linus Torvalds wrote: > Ok, > I just did another kernel merge to pick up the i810 compatibility bits, > and decided it is time to try to merge back some of the stuff that has > accumulated in the standard kernel and that makes it more painful than > necessary to exa

Re: [Dri-devel] Kernel tree CVS merge..

2003-08-14 Thread Dave Airlie
Okay I've applied my piece along with a number of other similiar whitespace cleanups .. to align with the kernel style .. Dave. On Fri, 15 Aug 2003, Dave Airlie wrote: > > okay I'm happy to apply the i810 portion and will do so soon, someone else > want to look after the other pieces or should

Re: [Dri-devel] Kernel tree CVS merge..

2003-08-14 Thread Dave Airlie
okay I'm happy to apply the i810 portion and will do so soon, someone else want to look after the other pieces or should I do them also? Dave. On Thu, 14 Aug 2003, Linus Torvalds wrote: > > Ok, > I just did another kernel merge to pick up the i810 compatibility bits, > and decided it is time t

[Dri-devel] Kernel tree CVS merge..

2003-08-14 Thread Linus Torvalds
Ok, I just did another kernel merge to pick up the i810 compatibility bits, and decided it is time to try to merge back some of the stuff that has accumulated in the standard kernel and that makes it more painful than necessary to examine the diffs for differences. This is mostly whitespace c