diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /include/asm-um/page.h | |
| parent | [AGPGART] Make AGP depend on PCI (diff) | |
| parent | [PATCH] KConfig: Spellchecking 'similarity' and 'independent' (diff) | |
| download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz linux-55b4d6a52195a8f277ffddf755ddaff359878f41.zip | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'include/asm-um/page.h')
| -rw-r--r-- | include/asm-um/page.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-um/page.h b/include/asm-um/page.h index 41364330aff1..4296d3135aa9 100644 --- a/include/asm-um/page.h +++ b/include/asm-um/page.h @@ -9,7 +9,6 @@ struct page; -#include <linux/config.h> #include <asm/vm-flags.h> /* PAGE_SHIFT determines the page size */ |