diff options
| author |   Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /drivers/char/drm/drm.h | |
| parent | kbuild: explicit turn off gcc stack-protector (diff) | |
| parent | [PATCH] genirq: Fixup ARM devel merge (diff) | |
| download | linux-dev-05668381140309088443bf5dc53add4104610fbb.tar.xz linux-dev-05668381140309088443bf5dc53add4104610fbb.zip | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'drivers/char/drm/drm.h')
| -rw-r--r-- | drivers/char/drm/drm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h index 9da0ddb892b5..5642ac43e0f5 100644 --- a/drivers/char/drm/drm.h +++ b/drivers/char/drm/drm.h @@ -38,7 +38,6 @@ #if defined(__linux__) #if defined(__KERNEL__) -#include <linux/config.h> #endif #include <asm/ioctl.h> /* For _IO* macros */ #define DRM_IOCTL_NR(n) _IOC_NR(n) |