Mark build test makefiles as being incompatible with parallel make builds, as they...

[pub/USBasp.git] / LUFA / Drivers / Peripheral / ADC.h

diff --git a/LUFA/Drivers/Peripheral/ADC.h b/LUFA/Drivers/Peripheral/ADC.h
index 29e32a8..2fb790c 100644 (file)
--- a/LUFA/Drivers/Peripheral/ADC.h
+++ b/LUFA/Drivers/Peripheral/ADC.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -29,7 +29,7 @@
 */
 
 /** \file
 */
 
 /** \file

- *  \brief Master include file for the ADC peripheral driver.
+ *  \brief Hardware Analogue-to-Digital converter driver.

  *
  *  This file is the master dispatch header file for the device-specific ADC driver, for microcontrollers
  *  containing an ADC.
  *
  *  This file is the master dispatch header file for the device-specific ADC driver, for microcontrollers
  *  containing an ADC.


@@ -40,6 +40,7 @@
 
 /** \ingroup Group_PeripheralDrivers
  *  \defgroup Group_ADC ADC Driver - LUFA/Drivers/Peripheral/ADC.h
 
 /** \ingroup Group_PeripheralDrivers
  *  \defgroup Group_ADC ADC Driver - LUFA/Drivers/Peripheral/ADC.h

+ *  \brief Hardware Analogue-to-Digital converter driver.

  *
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:
  *
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:


@@ -58,16 +59,14 @@
 #define __ADC_H__
 
        /* Macros: */
 #define __ADC_H__
 
        /* Macros: */

-               #if !defined(__DOXYGEN__)
-                       #define __INCLUDE_FROM_ADC_H
-               #endif
+               #define __INCLUDE_FROM_ADC_H

 
        /* Includes: */
                #include "../../Common/Common.h"
 
        /* Includes: */
                #if (ARCH == ARCH_AVR8)
 
        /* Includes: */
                #include "../../Common/Common.h"
 
        /* Includes: */
                #if (ARCH == ARCH_AVR8)

-                       #include "AVR8/ADC.h"
+                       #include "AVR8/ADC_AVR8.h"

                #else
                        #error The ADC peripheral driver is not currently available for your selected architecture.
                #endif
                #else
                        #error The ADC peripheral driver is not currently available for your selected architecture.
                #endif