diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 17:48:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 17:48:48 +0100 |
| commit | 2e1ca21d46aaef95101723fa402f39d3a95aba59 (patch) | |
| tree | cd95efefb9ccb6ab4ac0589d01c06cdfc22cc989 /drivers/video/matrox/matroxfb_Ti3026.c | |
| parent | [PATCH] mm: restore vm_normal_page check (diff) | |
| parent | kbuild: remove obsoleted scripts/reference_* files (diff) | |
| download | linux-2e1ca21d46aaef95101723fa402f39d3a95aba59.tar.xz linux-2e1ca21d46aaef95101723fa402f39d3a95aba59.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
kbuild: remove obsoleted scripts/reference_* files
kbuild: fix make help & make *pkg
kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
Kconfig: remove the CONFIG_CC_ALIGN_* options
kbuild: add -fverbose-asm to i386 Makefile
kbuild: clean-up genksyms
kbuild: Lindent genksyms.c
kbuild: fix genksyms build error
kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
kbuild: replace PHONY with FORCE
kbuild: Fix bug in crc symbol generating of kernel and modules
kbuild: change kbuild to not rely on incorrect GNU make behavior
kbuild: when warning symbols exported twice now tell user this is the problem
kbuild: fix make dir/file.xx when asm symlink is missing
kbuild: in the section mismatch check try harder to find symbols
kbuild: fix section mismatch check for unwind on IA64
kbuild: kill false positives from section mismatch warnings for powerpc
kbuild: kill trailing whitespace in modpost & friends
kbuild: small update of allnoconfig description
kbuild: make namespace.pl CROSS_COMPILE happy
...
Trivial conflict in arch/ppc/boot/Makefile manually fixed up
Diffstat (limited to 'drivers/video/matrox/matroxfb_Ti3026.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_Ti3026.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c index 537ade5d8b21..23ebad0a12d8 100644 --- a/drivers/video/matrox/matroxfb_Ti3026.c +++ b/drivers/video/matrox/matroxfb_Ti3026.c @@ -78,7 +78,6 @@ * */ -/* make checkconfig does not verify included files... */ #include <linux/config.h> #include "matroxfb_Ti3026.h" |