summaryrefslogtreecommitdiff
path: root/include/asm-m68knommu/mcfsim.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-23 06:11:56 +0400
committerJeff Garzik <jeff@garzik.org>2006-06-23 06:11:56 +0400
commit71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch)
treee786da7145d83c19a594adf76ed90d52c51058b1 /include/asm-m68knommu/mcfsim.h
parentd7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff)
parentd588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff)
downloadlinux-71d530cd1b6d97094481002a04c77fea1c8e1c22.tar.xz
Merge branch 'master' into upstream
Conflicts: drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h
Diffstat (limited to 'include/asm-m68knommu/mcfsim.h')
-rw-r--r--include/asm-m68knommu/mcfsim.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m68knommu/mcfsim.h b/include/asm-m68knommu/mcfsim.h
index 81d74a31dc43..97a0c2734a72 100644
--- a/include/asm-m68knommu/mcfsim.h
+++ b/include/asm-m68knommu/mcfsim.h
@@ -12,7 +12,6 @@
#define mcfsim_h
/****************************************************************************/
-#include <linux/config.h>
/*
* Include 5204, 5206/e, 5235, 5249, 5270/5271, 5272, 5280/5282,