summaryrefslogtreecommitdiff
path: root/include/asm-m68knommu/io.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-23 06:51:46 +0400
committerJeff Garzik <jeff@garzik.org>2006-06-23 06:51:46 +0400
commitdbe1ab9514c231c9b062140a107d9dea0eabefcc (patch)
tree0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/asm-m68knommu/io.h
parent612eff0e3715a6faff5ba1b74873b99e036c59fe (diff)
parentd588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff)
downloadlinux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-m68knommu/io.h')
-rw-r--r--include/asm-m68knommu/io.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m68knommu/io.h b/include/asm-m68knommu/io.h
index e08f2ee4b4a2..8df4cee2a0cd 100644
--- a/include/asm-m68knommu/io.h
+++ b/include/asm-m68knommu/io.h
@@ -3,7 +3,6 @@
#ifdef __KERNEL__
-#include <linux/config.h>
/*
* These are for ISA/PCI shared memory _only_ and should never be used