From 1b9b3a7b47124cf9c546e38786b9c050d92fc8fd Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 20 Jul 2016 13:48:24 -0600
Subject: [PATCH] pwm.h moved from include/nuttx/ to include/nuttx/drivers.

---
 Documentation/NuttxPortingGuide.html        | 2 +-
 arch/arm/src/efm32/efm32_pwm.c              | 2 +-
 arch/arm/src/efm32/efm32_pwm.h              | 2 +-
 arch/arm/src/kinetis/kinetis_pwm.c          | 2 +-
 arch/arm/src/kl/kl_pwm.c                    | 2 +-
 arch/arm/src/lpc11xx/lpc11_timer.c          | 2 +-
 arch/arm/src/lpc17xx/lpc17_mcpwm.c          | 2 +-
 arch/arm/src/lpc17xx/lpc17_pwm.c            | 2 +-
 arch/arm/src/lpc17xx/lpc17_timer.c          | 2 +-
 arch/arm/src/sama5/sam_pwm.c                | 2 +-
 arch/arm/src/stm32/stm32_pwm.c              | 2 +-
 arch/arm/src/stm32/stm32_pwm.h              | 2 +-
 arch/arm/src/stm32l4/stm32l4_pwm.c          | 2 +-
 arch/arm/src/stm32l4/stm32l4_pwm.h          | 2 +-
 configs/freedom-kl25z/src/kl_pwm.c          | 2 +-
 configs/freedom-kl26z/src/kl_pwm.c          | 2 +-
 configs/lpcxpresso-lpc1115/src/lpc11_pwm.c  | 2 +-
 configs/lpcxpresso-lpc1768/src/lpc17_pwm.c  | 2 +-
 configs/mbed/src/lpc17_pwm.c                | 2 +-
 configs/mikroe-stm32f4/src/stm32_pwm.c      | 2 +-
 configs/nucleo-f303re/src/stm32_pwm.c       | 2 +-
 configs/sama5d3-xplained/src/sam_pwm.c      | 2 +-
 configs/sama5d3x-ek/src/sam_pwm.c           | 2 +-
 configs/sama5d4-ek/src/sam_pwm.c            | 2 +-
 configs/stm3220g-eval/src/stm32_pwm.c       | 2 +-
 configs/stm3240g-eval/src/stm32_pwm.c       | 2 +-
 configs/stm32_tiny/src/stm32_pwm.c          | 2 +-
 configs/stm32f3discovery/src/stm32_pwm.c    | 2 +-
 configs/stm32f4discovery/src/stm32_pwm.c    | 2 +-
 configs/stm32f4discovery/src/stm32_rgbled.c | 2 +-
 configs/stm32ldiscovery/src/stm32_pwm.c     | 2 +-
 configs/teensy-3.x/src/k20_pwm.c            | 2 +-
 configs/teensy-lc/src/kl_pwm.c              | 2 +-
 configs/u-blox-c027/src/lpc17_pwm.c         | 2 +-
 drivers/Kconfig                             | 2 +-
 drivers/README.txt                          | 2 +-
 drivers/leds/rgbled.c                       | 2 +-
 drivers/pwm.c                               | 2 +-
 include/nuttx/{ => drivers}/pwm.h           | 8 ++++----
 include/nuttx/fs/ioctl.h                    | 2 +-
 include/nuttx/leds/rgbled.h                 | 2 +-
 41 files changed, 44 insertions(+), 44 deletions(-)
 rename include/nuttx/{ => drivers}/pwm.h (98%)

diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 96973ec865..bf32596fef 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -4439,7 +4439,7 @@ void board_autoled_off(int led);
 </p>
 <ul>
   <li><b>Interface Definition</b>.
-    The header file for the NuttX PWM driver reside at <code>include/nuttx/pwm.h</code>.
+    The header file for the NuttX PWM driver reside at <code>include/nuttx/drivers/pwm.h</code>.
     This header file includes both the application level interface to the PWM driver as well as the interface between the &quot;upper half&quot; and &quot;lower half&quot; drivers.
     The PWM module uses a standard character driver framework.
     However, since the PWM driver is a devices control interface and not a data transfer interface,
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index b34d8aeb2f..f07a3eed4b 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -47,7 +47,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
diff --git a/arch/arm/src/efm32/efm32_pwm.h b/arch/arm/src/efm32/efm32_pwm.h
index af46c3b6f8..61e4f5f116 100644
--- a/arch/arm/src/efm32/efm32_pwm.h
+++ b/arch/arm/src/efm32/efm32_pwm.h
@@ -39,7 +39,7 @@
 /* The EFM32 does not have dedicated PWM hardware.  Rather, pulsed output 
  * control is a capability of the EFM32 timers.  The logic in this file 
  * implements the lower half of the standard, NuttX PWM interface using the 
- * EFM32 timers. That interface is described in include/nuttx/pwm.h.
+ * EFM32 timers. That interface is described in include/nuttx/drivers/pwm.h.
  */
 
 /****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 19de382634..d4ccc74090 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -49,7 +49,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "up_internal.h"
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index 6f3f6e4050..a34aa0f817 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@@ -48,7 +48,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "up_internal.h"
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c
index e742dc2de0..a9ce65a073 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/arch/arm/src/lpc11xx/lpc11_timer.c
@@ -47,7 +47,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "up_internal.h"
diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
index be526964c4..db0d1a9d67 100644
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
@@ -47,7 +47,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "up_internal.h"
diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c
index dc073fc1a7..c284934570 100644
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.c
@@ -47,7 +47,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "up_internal.h"
diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c
index 9278578b67..434f416021 100644
--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/arch/arm/src/lpc17xx/lpc17_timer.c
@@ -47,7 +47,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "up_internal.h"
diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c
index 0de1d91dea..d523da24a1 100644
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include "chip/sam_pinmap.h"
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index 7b8f4224e0..425f256ba0 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "up_internal.h"
diff --git a/arch/arm/src/stm32/stm32_pwm.h b/arch/arm/src/stm32/stm32_pwm.h
index e636ead3a3..1321389046 100644
--- a/arch/arm/src/stm32/stm32_pwm.h
+++ b/arch/arm/src/stm32/stm32_pwm.h
@@ -41,7 +41,7 @@
 /* The STM32 does not have dedicated PWM hardware.  Rather, pulsed output control
  * is a capabilitiy of the STM32 timers.  The logic in this file implements the
  * lower half of the standard, NuttX PWM interface using the STM32 timers.  That
- * interface is described in include/nuttx/pwm.h.
+ * interface is described in include/nuttx/drivers/pwm.h.
  */
 
 /************************************************************************************
diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.c b/arch/arm/src/stm32l4/stm32l4_pwm.c
index b5cd35fb29..d3478ea0df 100644
--- a/arch/arm/src/stm32l4/stm32l4_pwm.c
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "up_internal.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.h b/arch/arm/src/stm32l4/stm32l4_pwm.h
index fff04e9e47..942aef0cfa 100644
--- a/arch/arm/src/stm32l4/stm32l4_pwm.h
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.h
@@ -41,7 +41,7 @@
 /* The STM32L4 does not have dedicated PWM hardware.  Rather, pulsed output control
  * is a capability of the STM32L4 timers.  The logic in this file implements the
  * lower half of the standard, NuttX PWM interface using the STM32L4 timers.  That
- * interface is described in include/nuttx/pwm.h.
+ * interface is described in include/nuttx/drivers/pwm.h.
  */
 
 /************************************************************************************
diff --git a/configs/freedom-kl25z/src/kl_pwm.c b/configs/freedom-kl25z/src/kl_pwm.c
index e00d1ca52b..1db53f5a26 100644
--- a/configs/freedom-kl25z/src/kl_pwm.c
+++ b/configs/freedom-kl25z/src/kl_pwm.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/freedom-kl26z/src/kl_pwm.c b/configs/freedom-kl26z/src/kl_pwm.c
index 672d49e70e..cb5b6af3f8 100644
--- a/configs/freedom-kl26z/src/kl_pwm.c
+++ b/configs/freedom-kl26z/src/kl_pwm.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c b/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
index 6f303e5f5e..9ecbfcf85e 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "chip.h"
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
index 4b261555cb..5aec1613c1 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/mbed/src/lpc17_pwm.c b/configs/mbed/src/lpc17_pwm.c
index c8b6881dc9..5b312bd71b 100644
--- a/configs/mbed/src/lpc17_pwm.c
+++ b/configs/mbed/src/lpc17_pwm.c
@@ -46,7 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/mikroe-stm32f4/src/stm32_pwm.c b/configs/mikroe-stm32f4/src/stm32_pwm.c
index 0710d42f8b..39ac1f2b6c 100644
--- a/configs/mikroe-stm32f4/src/stm32_pwm.c
+++ b/configs/mikroe-stm32f4/src/stm32_pwm.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/nucleo-f303re/src/stm32_pwm.c b/configs/nucleo-f303re/src/stm32_pwm.c
index 6b940e8879..7ab25eac4d 100644
--- a/configs/nucleo-f303re/src/stm32_pwm.c
+++ b/configs/nucleo-f303re/src/stm32_pwm.c
@@ -46,7 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include "stm32_pwm.h"
 #include "nucleo-f303re.h"
diff --git a/configs/sama5d3-xplained/src/sam_pwm.c b/configs/sama5d3-xplained/src/sam_pwm.c
index 91664c1d21..a6acea54d8 100644
--- a/configs/sama5d3-xplained/src/sam_pwm.c
+++ b/configs/sama5d3-xplained/src/sam_pwm.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/sama5d3x-ek/src/sam_pwm.c b/configs/sama5d3x-ek/src/sam_pwm.c
index ef90855451..8cc1642e71 100644
--- a/configs/sama5d3x-ek/src/sam_pwm.c
+++ b/configs/sama5d3x-ek/src/sam_pwm.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/sama5d4-ek/src/sam_pwm.c b/configs/sama5d4-ek/src/sam_pwm.c
index b69d8f5e5a..ebae4ce11b 100644
--- a/configs/sama5d4-ek/src/sam_pwm.c
+++ b/configs/sama5d4-ek/src/sam_pwm.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/stm3220g-eval/src/stm32_pwm.c b/configs/stm3220g-eval/src/stm32_pwm.c
index b934120856..e689794d57 100644
--- a/configs/stm3220g-eval/src/stm32_pwm.c
+++ b/configs/stm3220g-eval/src/stm32_pwm.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/stm3240g-eval/src/stm32_pwm.c b/configs/stm3240g-eval/src/stm32_pwm.c
index 4ccf6dad9c..a565995d42 100644
--- a/configs/stm3240g-eval/src/stm32_pwm.c
+++ b/configs/stm3240g-eval/src/stm32_pwm.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/stm32_tiny/src/stm32_pwm.c b/configs/stm32_tiny/src/stm32_pwm.c
index 8efec614b6..675e9d0c15 100644
--- a/configs/stm32_tiny/src/stm32_pwm.c
+++ b/configs/stm32_tiny/src/stm32_pwm.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/stm32f3discovery/src/stm32_pwm.c b/configs/stm32f3discovery/src/stm32_pwm.c
index 1cdfb8c9c4..a11d2a464a 100644
--- a/configs/stm32f3discovery/src/stm32_pwm.c
+++ b/configs/stm32f3discovery/src/stm32_pwm.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/stm32f4discovery/src/stm32_pwm.c b/configs/stm32f4discovery/src/stm32_pwm.c
index 9e80b06c7e..5d7d8ee7fd 100644
--- a/configs/stm32f4discovery/src/stm32_pwm.c
+++ b/configs/stm32f4discovery/src/stm32_pwm.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>
 
 #include "chip.h"
diff --git a/configs/stm32f4discovery/src/stm32_rgbled.c b/configs/stm32f4discovery/src/stm32_rgbled.c
index 66dc4fd0f1..c1d320a05a 100644
--- a/configs/stm32f4discovery/src/stm32_rgbled.c
+++ b/configs/stm32f4discovery/src/stm32_rgbled.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <nuttx/leds/rgbled.h>
 #include <arch/board/board.h>
 
diff --git a/configs/stm32ldiscovery/src/stm32_pwm.c b/configs/stm32ldiscovery/src/stm32_pwm.c
index 8da1601b71..1aeca320fc 100644
--- a/configs/stm32ldiscovery/src/stm32_pwm.c
+++ b/configs/stm32ldiscovery/src/stm32_pwm.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/teensy-3.x/src/k20_pwm.c b/configs/teensy-3.x/src/k20_pwm.c
index 97658c9e2b..5fc7652f16 100644
--- a/configs/teensy-3.x/src/k20_pwm.c
+++ b/configs/teensy-3.x/src/k20_pwm.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/teensy-lc/src/kl_pwm.c b/configs/teensy-lc/src/kl_pwm.c
index 91623d9e98..13d58804db 100644
--- a/configs/teensy-lc/src/kl_pwm.c
+++ b/configs/teensy-lc/src/kl_pwm.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/configs/u-blox-c027/src/lpc17_pwm.c b/configs/u-blox-c027/src/lpc17_pwm.c
index 435acf3473..03569cc11d 100644
--- a/configs/u-blox-c027/src/lpc17_pwm.c
+++ b/configs/u-blox-c027/src/lpc17_pwm.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <arch/board/board.h>
 
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 090fbf5168..6cd2ac541e 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -286,7 +286,7 @@ menuconfig PWM
 	default n
 	---help---
 		This selection enables building of the "upper-half" PWM driver.
-		See include/nuttx/pwm.h for further PWM driver information.
+		See include/nuttx/drivers/pwm.h for further PWM driver information.
 
 if PWM
 
diff --git a/drivers/README.txt b/drivers/README.txt
index 7137db2aa0..42989af120 100644
--- a/drivers/README.txt
+++ b/drivers/README.txt
@@ -25,7 +25,7 @@ dev_null.c and dev_zero.c
 pwm.c
   Provides the "upper half" of a pulse width modulation (PWM) driver.
   The "lower half" of the PWM driver is provided by device-specific
-  logic.  See include/nuttx/pwm.h for usage information.
+  logic.  See include/nuttx/drivers/pwm.h for usage information.
 
 ramdisk.c
   Can be used to set up a block of memory or (read-only) FLASH as
diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c
index 88eb2f6223..81b2ff5591 100644
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@@ -55,7 +55,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <nuttx/leds/rgbled.h>
 
 #include <arch/irq.h>
diff --git a/drivers/pwm.c b/drivers/pwm.c
index 7fb6b3436f..f3de79a387 100644
--- a/drivers/pwm.c
+++ b/drivers/pwm.c
@@ -58,7 +58,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 
 #include <nuttx/irq.h>
 
diff --git a/include/nuttx/pwm.h b/include/nuttx/drivers/pwm.h
similarity index 98%
rename from include/nuttx/pwm.h
rename to include/nuttx/drivers/pwm.h
index fe13a4efc6..7cf80b0d7b 100644
--- a/include/nuttx/pwm.h
+++ b/include/nuttx/drivers/pwm.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/pwm.h
+ * include/nuttx/drivers/pwm.h
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_PWM_H
-#define __INCLUDE_NUTTX_PWM_H
+#ifndef __INCLUDE_NUTTX_DRIVERS_PWM_H
+#define __INCLUDE_NUTTX_DRIVERS_PWM_H
 
 /* For the purposes of this driver, a PWM device is any device that generates
  * periodic output pulses s of controlled frequency and pulse width.  Such a
@@ -316,4 +316,4 @@ void pwm_expired(FAR void *handle);
 #endif
 
 #endif /* CONFIG_PWM */
-#endif /* __INCLUDE_NUTTX_PWM_H */
+#endif /* __INCLUDE_NUTTX_DRIVERS_PWM_H */
diff --git a/include/nuttx/fs/ioctl.h b/include/nuttx/fs/ioctl.h
index adfa0446cd..ba7586e3da 100644
--- a/include/nuttx/fs/ioctl.h
+++ b/include/nuttx/fs/ioctl.h
@@ -251,7 +251,7 @@
                                            * IN: None
                                            * OUT: None */
 
-/* NuttX PWM ioctl definitions (see nuttx/pwm.h) ****************************/
+/* NuttX PWM ioctl definitions (see nuttx/drivers/pwm.h) ****************************/
 
 #define _PWMIOCVALID(c)   (_IOC_TYPE(c)==_PWMIOCBASE)
 #define _PWMIOC(nr)       _IOC(_PWMIOCBASE,nr)
diff --git a/include/nuttx/leds/rgbled.h b/include/nuttx/leds/rgbled.h
index 07560d6a6e..554f0719ff 100644
--- a/include/nuttx/leds/rgbled.h
+++ b/include/nuttx/leds/rgbled.h
@@ -45,7 +45,7 @@
 
 #include <fixedmath.h>
 
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <nuttx/fs/ioctl.h>
 
 #ifdef CONFIG_RGBLED