summaryrefslogtreecommitdiffstats
path: root/arch/m32r/kernel/setup_usrv.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-01 00:39:30 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-01 00:39:30 +0200
commit22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch)
tree7ef158ba2c30e0dde2dc103d1904fae243759a6b /arch/m32r/kernel/setup_usrv.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/ (diff)
parentRemove obsolete #include <linux/config.h> (diff)
downloadlinux-22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13.tar.xz
linux-22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13.zip
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 'arch/m32r/kernel/setup_usrv.c')
-rw-r--r--arch/m32r/kernel/setup_usrv.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m32r/kernel/setup_usrv.c b/arch/m32r/kernel/setup_usrv.c
index 7fa12d8f66b4..f5b4b5ac31e7 100644
--- a/arch/m32r/kernel/setup_usrv.c
+++ b/arch/m32r/kernel/setup_usrv.c
@@ -7,7 +7,6 @@
* Hitoshi Yamamoto
*/
-#include <linux/config.h>
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/init.h>