diff --git a/[refs] b/[refs]
index 27dd28b32eb8..d2c2e33abd63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b443caf12f9ee14e9843e53d4d929319e637275a
+refs/heads/master: 3d92e05118262379f76a220772b666dfddb77a9d
diff --git a/trunk/arch/avr32/mach-at32ap/include/mach/board.h b/trunk/arch/avr32/mach-at32ap/include/mach/board.h
index 71733866cb4f..70742ec997f8 100644
--- a/trunk/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/trunk/arch/avr32/mach-at32ap/include/mach/board.h
@@ -7,7 +7,7 @@
 #include <linux/types.h>
 #include <linux/serial.h>
 #include <linux/platform_data/macb.h>
-#include <linux/platform_data/atmel_nand.h>
+#include <linux/platform_data/atmel.h>
 
 #define GPIO_PIN_NONE	(-1)
 
diff --git a/trunk/include/linux/platform_data/atmel.h b/trunk/include/linux/platform_data/atmel.h
index d056263545b1..b0f2c56a8ea2 100644
--- a/trunk/include/linux/platform_data/atmel.h
+++ b/trunk/include/linux/platform_data/atmel.h
@@ -4,8 +4,8 @@
  * GPL v2 Only
  */
 
-#ifndef __ATMEL_NAND_H__
-#define __ATMEL_NAND_H__
+#ifndef __ATMEL_H__
+#define __ATMEL_H__
 
 #include <linux/mtd/nand.h>
 
@@ -24,4 +24,4 @@ struct atmel_nand_data {
 	unsigned int	num_parts;
 };
 
-#endif /* __ATMEL_NAND_H__ */
+#endif /* __ATMEL_H__ */