Messages in this thread | | | Date | Mon, 13 Feb 2006 16:01:13 +0100 | From | Herbert Poetzl <> | Subject | Re: [PATCH] remove duplicate #includes |
| |
On Mon, Feb 13, 2006 at 11:26:56AM +0100, Bastian Blank wrote: > On Mon, Feb 13, 2006 at 10:39:59AM +0100, Herbert Poetzl wrote: > > diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h > > --- linux-2.6.16-rc2/drivers/char/drm/drm.h 2006-02-07 11:52:24 +0100 > > +++ linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h 2006-02-13 01:48:55 +0100 > > @@ -51,11 +51,9 @@ > > #if defined(__FreeBSD__) && defined(IN_MODULE) > > /* Prevent name collision when including sys/ioccom.h */ > > #undef ioctl > > -#include <sys/ioccom.h> > > #define ioctl(a,b,c) xf86ioctl(a,b,c) > > -#else > > -#include <sys/ioccom.h> > > #endif /* __FreeBSD__ && xf86ioctl */ > > +#include <sys/ioccom.h> > > #define DRM_IOCTL_NR(n) ((n) & 0xff) > > #define DRM_IOC_VOID IOC_VOID > > #define DRM_IOC_READ IOC_OUT > > This one changes the behaviour.
hmm, yes, doesn't make much sense to remove that dumplicate entry anyway, so I'll simply drop that one from the patch ...
thanks a lot for the feedback!
> But do we want to have this non-linux hacks in the tree?
good question
best, Herbert
> Bastian > > -- > It would be illogical to assume that all conditions remain stable. > -- Spock, "The Enterprise Incident", stardate 5027.3
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |