summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c64xx/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 18:36:35 +0100
committerJiri Kosina <jkosina@suse.cz>2009-12-07 18:36:35 +0100
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/plat-s3c64xx/Kconfig
parentMerge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parenttree-wide: fix misspelling of "definition" in comments (diff)
downloadlinux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.xz
linux-d014d043869cdc591f3a33243d3481fa4479c2d0.zip
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'arch/arm/plat-s3c64xx/Kconfig')
-rw-r--r--arch/arm/plat-s3c64xx/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c64xx/Kconfig b/arch/arm/plat-s3c64xx/Kconfig
index bcfa778614d8..e6da87a5885c 100644
--- a/arch/arm/plat-s3c64xx/Kconfig
+++ b/arch/arm/plat-s3c64xx/Kconfig
@@ -1,5 +1,3 @@
-# arch/arm/plat-s3c64xx/Kconfig
-#
# Copyright 2008 Openmoko, Inc.
# Copyright 2008 Simtec Electronics
# Ben Dooks <ben@simtec.co.uk>