diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
| commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
| tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /drivers/video/matrox/matroxfb_Ti3026.h | |
| parent | 39302175c26d74be35715c05a0f342c9e64c21bf (diff) | |
| parent | 6ab3d5624e172c553004ecc862bfeac16d9d68b7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_encrypt
arch/arm26/Kconfig typos
Documentation/IPMI typos
Kconfig: Typos in net/sched/Kconfig
v9fs: do not include linux/version.h
Documentation/DocBook/mtdnand.tmpl: typo fixes
typo fixes: specfic -> specific
typo fixes in Documentation/networking/pktgen.txt
typo fixes: occuring -> occurring
typo fixes: infomation -> information
typo fixes: disadvantadge -> disadvantage
typo fixes: aquire -> acquire
typo fixes: mecanism -> mechanism
typo fixes: bandwith -> bandwidth
fix a typo in the RTC_CLASS help text
smb is no longer maintained
Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
Diffstat (limited to 'drivers/video/matrox/matroxfb_Ti3026.h')
| -rw-r--r-- | drivers/video/matrox/matroxfb_Ti3026.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_Ti3026.h b/drivers/video/matrox/matroxfb_Ti3026.h index 536e5f69de9f..27872aaa0a17 100644 --- a/drivers/video/matrox/matroxfb_Ti3026.h +++ b/drivers/video/matrox/matroxfb_Ti3026.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __MATROXFB_TI3026_H__ | 1 | #ifndef __MATROXFB_TI3026_H__ |
| 2 | #define __MATROXFB_TI3026_H__ | 2 | #define __MATROXFB_TI3026_H__ |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | 4 | ||
| 6 | #include "matroxfb_base.h" | 5 | #include "matroxfb_base.h" |
| 7 | 6 | ||