summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 18:59:57 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 18:59:57 +0200
commitfefd26b3b8597a11a422d950c0d4424ff33a70ad (patch)
tree6794a36072635e71e5b33aec47c616bafdca65c1 /drivers/rtc
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6 (diff)
parentRemove all inclusions of <linux/config.h> (diff)
downloadlinux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.xz
linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh: Remove all inclusions of <linux/config.h> Manually resolved trivial path conflicts due to removed files in the sound/oss/ subdirectory.
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-max6902.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 2f0b77724192..0b20dfacbf59 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -19,7 +19,6 @@
* - Initial driver creation.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/version.h>