3 files changed, 23 insertions, 49 deletions

diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index fcd82320a6a3..1a45ed1e8ba1 100644
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
@@ -2,7 +2,7 @@
  * OMAP2/3 clockdomain framework functions
  *
  * Copyright (C) 2008 Texas Instruments, Inc.
- * Copyright (C) 2008 Nokia Corporation
+ * Copyright (C) 2008-2009 Nokia Corporation
  *
  * Written by Paul Walmsley and Jouni Högander
  *
@@ -10,9 +10,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#ifdef CONFIG_OMAP_DEBUG_CLOCKDOMAIN
-#  define DEBUG
-#endif
+#undef DEBUG
 
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index b6990e377783..9708f12bb8a0 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -10,9 +10,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#ifdef CONFIG_OMAP_DEBUG_POWERDOMAIN
-# define DEBUG
-#endif
+#undef DEBUG
 
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index f348ddfb0492..353a7b31c62b 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -42,28 +42,6 @@ config OMAP_DEBUG_LEDS
         depends on OMAP_DEBUG_DEVICES
         default y if LEDS || LEDS_OMAP_DEBUG
 
-config OMAP_DEBUG_POWERDOMAIN
-        bool "Emit debug messages from powerdomain layer"
-        depends on ARCH_OMAP2 || ARCH_OMAP3
-        help
-          Say Y here if you want to compile in powerdomain layer
-          debugging messages for OMAP2/3.   These messages can
-          provide more detail as to why some powerdomain calls
-          may be failing, and will also emit a descriptive message
-          for every powerdomain register write.  However, the
-          extra detail costs some memory.
-
-config OMAP_DEBUG_CLOCKDOMAIN
-        bool "Emit debug messages from clockdomain layer"
-        depends on ARCH_OMAP2 || ARCH_OMAP3
-        help
-          Say Y here if you want to compile in clockdomain layer
-          debugging messages for OMAP2/3.   These messages can
-          provide more detail as to why some clockdomain calls
-          may be failing, and will also emit a descriptive message
-          for every clockdomain register write.  However, the
-          extra detail costs some memory.
-
 config OMAP_RESET_CLOCKS
         bool "Reset unused clocks during boot"
         depends on ARCH_OMAP
@@ -78,28 +56,28 @@ config OMAP_RESET_CLOCKS
 
 config OMAP_MUX
         bool "OMAP multiplexing support"
-        depends on ARCH_OMAP
+        depends on ARCH_OMAP
         default y
-        help
-          Pin multiplexing support for OMAP boards. If your bootloader
-          sets the multiplexing correctly, say N. Otherwise, or if unsure,
-          say Y.
+        help
+          Pin multiplexing support for OMAP boards. If your bootloader
+          sets the multiplexing correctly, say N. Otherwise, or if unsure,
+          say Y.
 
 config OMAP_MUX_DEBUG
         bool "Multiplexing debug output"
-        depends on OMAP_MUX
-        help
-          Makes the multiplexing functions print out a lot of debug info.
-          This is useful if you want to find out the correct values of the
-          multiplexing registers.
+        depends on OMAP_MUX
+        help
+          Makes the multiplexing functions print out a lot of debug info.
+          This is useful if you want to find out the correct values of the
+          multiplexing registers.
 
 config OMAP_MUX_WARNINGS
         bool "Warn about pins the bootloader didn't set up"
-        depends on OMAP_MUX
-        default y
-        help
+        depends on OMAP_MUX
+        default y
+        help
           Choose Y here to warn whenever driver initialization logic needs
-          to change the pin multiplexing setup.  When there are no warnings
+          to change the pin multiplexing setup.  When there are no warnings
           printed, it's safe to deselect OMAP_MUX for your product.
 
 config OMAP_MCBSP
@@ -125,7 +103,7 @@ config OMAP_IOMMU_DEBUG
         tristate
 
 choice
-        prompt "System timer"
+        prompt "System timer"
         default OMAP_MPU_TIMER
 
 config OMAP_MPU_TIMER
@@ -148,11 +126,11 @@ config OMAP_32K_TIMER
 endchoice
 
 config OMAP_32K_TIMER_HZ
-       int "Kernel internal timer frequency for 32KHz timer"
-       range 32 1024
-       depends on OMAP_32K_TIMER
-       default "128"
-       help
+        int "Kernel internal timer frequency for 32KHz timer"
+        range 32 1024
+        depends on OMAP_32K_TIMER
+        default "128"
+        help
           Kernel internal timer frequency should be a divisor of 32768,
           such as 64 or 128.