diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-30 00:01:54 +0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-30 00:01:54 +0400 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /include/linux/cyclomx.h | |
| parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
| parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
| download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'include/linux/cyclomx.h')
| -rw-r--r-- | include/linux/cyclomx.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h index 300d704bdb9a..b88f7f428e58 100644 --- a/include/linux/cyclomx.h +++ b/include/linux/cyclomx.h @@ -24,7 +24,6 @@ * 1998/08/08 acme Version 0.0.1 */ -#include <linux/config.h> #include <linux/wanrouter.h> #include <linux/spinlock.h> |