From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 7 Apr 2010 07:21:03 +0000 (+0900)
Subject: Merge branches 'genesis/dmaengine', 'genesis/intc-extension' and 'genesis/i2c-updates'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9bc4341eb79d885e5a9dda6384a60bb0f4655fe7;p=linux-beck.git

Merge branches 'genesis/dmaengine', 'genesis/intc-extension' and 'genesis/i2c-updates'
---

9bc4341eb79d885e5a9dda6384a60bb0f4655fe7
diff --cc drivers/serial/sh-sci.c
index cd52dd64edf0,980f39449ee5,8eb094c1f61b..78e0545243d0
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@@@ -50,6 -50,7 -50,7 +50,7 @@@@
   #include <linux/list.h>
   #include <linux/dmaengine.h>
   #include <linux/scatterlist.h>
 - #include <linux/timer.h>
++ #include <linux/slab.h>
   
   #ifdef CONFIG_SUPERH
   #include <asm/sh_bios.h>