8 files changed, 23 insertions, 23 deletions
diff --git a/bsps/arm/csb337/include/at91rm9200.h b/bsps/arm/csb337/include/at91rm9200.h
index 706b3cc03d..7dbac04384 100644
--- a/bsps/arm/csb337/include/at91rm9200.h
+++ b/bsps/arm/csb337/include/at91rm9200.h
@@ -353,7 +353,7 @@ typedef volatile unsigned long vulong;
 /**
  * @defgroup csb337_at91rm9200 AT91RM9200
  *
- * @ingroup arm_csb337
+ * @ingroup RTEMSBSPsARMCSB337
  *
  * @brief Atmel Register Definitions, Used In KIT637_V6 (CSB637)
  */
diff --git a/bsps/arm/csb337/include/bits.h b/bsps/arm/csb337/include/bits.h
index 09a5cd50b7..105f4d4bd6 100644
--- a/bsps/arm/csb337/include/bits.h
+++ b/bsps/arm/csb337/include/bits.h
@@ -58,7 +58,7 @@
 /**
  *@defgroup csb337_bits Bits
  *
- *@ingroup arm_csb337
+ *@ingroup RTEMSBSPsARMCSB337
  *
  *@brief
  *
diff --git a/bsps/arm/csb337/include/bsp.h b/bsps/arm/csb337/include/bsp.h
index c757bf1bc9..d5daa63d3e 100644
--- a/bsps/arm/csb337/include/bsp.h
+++ b/bsps/arm/csb337/include/bsp.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup arm_csb337
+ * @ingroup RTEMSBSPsARMCSB337
  *
  * @brief Global BSP definitions.
  */
@@ -19,6 +19,16 @@
 #ifndef LIBBSP_ARM_CSB337_BSP_H
 #define LIBBSP_ARM_CSB337_BSP_H
 
+/**
+ * @defgroup RTEMSBSPsARMCSB337 CSB337
+ *
+ * @ingroup RTEMSBSPsARM
+ *
+ * @brief CSB337 Board Support Package.
+ *
+ * @{
+ */
+
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -28,16 +38,6 @@
 extern "C" {
 #endif
 
-/**
- * @defgroup arm_csb337 CSB337 Support
- *
- * @ingroup RTEMSBSPsARM
- *
- * @brief CSB337 support package.
- *
- * @{
- */
-
 #define BSP_FEATURE_IRQ_EXTENSION
 
 /* What is the input clock freq in hertz? */
@@ -68,11 +68,11 @@ int rtems_at91rm9200_emac_attach(struct rtems_bsdnet_ifconfig *config, int attac
 #define RTEMS_BSP_NETWORK_DRIVER_NAME	"eth0"
 #define RTEMS_BSP_NETWORK_DRIVER_ATTACH	rtems_at91rm9200_emac_attach
 
-/** @} */
-
 #ifdef __cplusplus
 }
 #endif
 
+/** @} */
+
 #endif /* _BSP_H */
 
diff --git a/bsps/arm/csb337/include/bsp/irq.h b/bsps/arm/csb337/include/bsp/irq.h
index ce683bc4ff..ffc022fa4f 100644
--- a/bsps/arm/csb337/include/bsp/irq.h
+++ b/bsps/arm/csb337/include/bsp/irq.h
@@ -32,7 +32,7 @@
 /**
  * @defgroup csb337_interrupt Interrrupt Support
  *
- * @ingroup arm_csb337
+ * @ingroup RTEMSBSPsARMCSB337
  *
  * @brief Interrupt Support.
  */
diff --git a/bsps/arm/csb337/include/font8x16.h b/bsps/arm/csb337/include/font8x16.h
index 0445b67668..3d0e144626 100644
--- a/bsps/arm/csb337/include/font8x16.h
+++ b/bsps/arm/csb337/include/font8x16.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup arm_csb337
+ * @ingroup RTEMSBSPsARMCSB337
  *
  * @brief Simple 8 x 16 font, printable characters only.
  */
@@ -9,7 +9,7 @@
 /**
  * @defgroup csb337_font Simple 8 x 16 font
  *
- * @ingroup arm_csb337
+ * @ingroup RTEMSBSPsARMCSB337
  *
  * @brief Simple 8 x 16 font, printable characters only.
  */
diff --git a/bsps/arm/csb337/include/sed1356.h b/bsps/arm/csb337/include/sed1356.h
index d4451ab7e1..583a2a3a77 100644
--- a/bsps/arm/csb337/include/sed1356.h
+++ b/bsps/arm/csb337/include/sed1356.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup arm_csb337
+ * @ingroup RTEMSBSPsARMCSB337
  *
  * @brief Public Interface for SED Video Controller Operations.
  */
@@ -9,7 +9,7 @@
 /**
  * @defgroup csb337_sed1356 SED Video Controller
  *
- * @ingroup arm_csb337
+ * @ingroup RTEMSBSPsARMCSB337
  *
  * @brief Public Interface for SED Video Controller Operations.
  */
diff --git a/bsps/arm/csb337/include/sed1356_16bit.h b/bsps/arm/csb337/include/sed1356_16bit.h
index 5ccf85d01c..a6149810b7 100644
--- a/bsps/arm/csb337/include/sed1356_16bit.h
+++ b/bsps/arm/csb337/include/sed1356_16bit.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup arm_csb337
+ * @ingroup RTEMSBSPsARMCSB337
  *
  * @brief SED1356 LCD/CRT Controllers for KIT637_V6 (CSB637)
  *        16-Bit access mode
@@ -10,7 +10,7 @@
 /**
  * @defgroup csb337_sed1356 SED Video Controller.
  *
- * @ingroup arm_csb337
+ * @ingroup RTEMSBSPsARMCSB337
  *
  * @brief SED1356 LCD/CRT Controllers for KIT637_V6 (CSB637)
  *        16-Bit access mode
diff --git a/bsps/arm/csb337/include/tm27.h b/bsps/arm/csb337/include/tm27.h
index 80b371d20b..c21ebcb284 100644
--- a/bsps/arm/csb337/include/tm27.h
+++ b/bsps/arm/csb337/include/tm27.h
@@ -1,7 +1,7 @@
 /**
  *@file
  *
- *@ingroup arm_csb337
+ *@ingroup RTEMSBSPsARMCSB337
  *
  *@brief Implementations of interrupt mechanisms for Time Test 27.
  *