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

[pub/USBasp.git] / LUFA / Drivers / Misc / AT45DB642D.h

diff --git a/LUFA/Drivers/Misc/AT45DB642D.h b/LUFA/Drivers/Misc/AT45DB642D.h
index cc8a641..f43f249 100644 (file)
--- a/LUFA/Drivers/Misc/AT45DB642D.h
+++ b/LUFA/Drivers/Misc/AT45DB642D.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


@@ -55,8 +55,6 @@
                        #define DF_STATUS_BINARYPAGESIZE_ON             (1 << 0)
                        //@}
 
                        #define DF_STATUS_BINARYPAGESIZE_ON             (1 << 0)
                        //@}
 

-                       #define DF_MANUFACTURER_ATMEL                   0x1F
-

                        /** \name Dataflash Commands */
                        //@{
                        #define DF_CMD_GETSTATUS                        0xD7
                        /** \name Dataflash Commands */
                        //@{
                        #define DF_CMD_GETSTATUS                        0xD7


@@ -109,6 +107,9 @@
                        #define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F
                        //@}
 
                        #define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F
                        //@}
 

+                       /** Manufacturer code for Atmel Corporation, returned by Atmel Dataflash ICs in response to the \c DF_CMD_READMANUFACTURERDEVICEINFO command. */
+                       #define DF_MANUFACTURER_ATMEL                   0x1F
+

 #endif
 
 /** @} */
 #endif
 
 /** @} */