Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[~andy/linux] / arch / blackfin / Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 7f3c589cc0243db4641fd735d4e18f290206e96f..79cfe2614bcc871f7faff8fd8c0d6f2c02b54fe8 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -1309,7 +1309,7 @@ config PM_BFIN_WAKE_GP
          (all processors, except ADSP-BF549). This option sets
          the general-purpose wake-up enable (GPWE) control bit to enable
          wake-up upon detection of an active low signal on the /GPW (PH7) pin.
-         On ADSP-BF549 this option enables the the same functionality on the
+         On ADSP-BF549 this option enables the same functionality on the
          /MRXON pin also PH7.
 
 config PM_BFIN_WAKE_PA15