summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-03 13:09:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-03 13:09:32 -0800
commit15f93405aae307a3cb2c33c795286463601963f7 (patch)
tree96f4b52b25180a4b7a2ecbc113d434b4296599d4
parentdf91fba5e7ed414b1856b33bbed6d55439a14c47 (diff)
parent6ebbabbaed0b38563f62100762e3b3780655f83f (diff)
downloadlinux-15f93405aae307a3cb2c33c795286463601963f7.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull avr32 update from Hans-Christian Noren Egtvedt. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32: avr32: atngw100: remove useless include
-rw-r--r--arch/avr32/boards/atngw100/mrmt.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c
index 91146b416cdb..99b0a7984950 100644
--- a/arch/avr32/boards/atngw100/mrmt.c
+++ b/arch/avr32/boards/atngw100/mrmt.c
@@ -21,7 +21,6 @@
#include <linux/leds_pwm.h>
#include <linux/input.h>
#include <linux/gpio_keys.h>
-#include <linux/atmel_serial.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>