Merge branch 'linus' into perfcounters/core-v2

[~andy/linux] / arch / avr32 / boards / hammerhead / flash.c

diff --git a/arch/avr32/boards/hammerhead/flash.c b/arch/avr32/boards/hammerhead/flash.c
index a98c6dd3a028affd33571ec6dbfb9b98961519a3..559bbcb03f9b696cb0589d649a803c8356772668 100644 (file)
--- a/arch/avr32/boards/hammerhead/flash.c
+++ b/arch/avr32/boards/hammerhead/flash.c
@@ -15,7 +15,6 @@
 #include <linux/mtd/physmap.h>
 #include <linux/usb/isp116x.h>
 #include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
 #include <linux/delay.h>
 
 #include <mach/portmux.h>