aboutsummaryrefslogtreecommitdiff
path: root/drivers/acorn
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 15:39:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 15:39:30 -0700
commit22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch)
tree7ef158ba2c30e0dde2dc103d1904fae243759a6b /drivers/acorn
parent39302175c26d74be35715c05a0f342c9e64c21bf (diff)
parent6ab3d5624e172c553004ecc862bfeac16d9d68b7 (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/acorn')
-rw-r--r--drivers/acorn/block/mfmhd.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c
index ce074f6f336..d9c9a35961b 100644
--- a/drivers/acorn/block/mfmhd.c
+++ b/drivers/acorn/block/mfmhd.c
@@ -99,7 +99,6 @@
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/fs.h>
#include <linux/interrupt.h>