aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/ucb1x00-ts.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 16:53:09 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 16:53:12 +0000
commitba71e17269633ea36e776d744d5cc0fcb5a41f93 (patch)
tree0a51c86e5c218ac2ae74ff8193880a64053a77bc /drivers/mfd/ucb1x00-ts.c
parentARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request (diff)
parentcollie: support pda_power driver (diff)
downloadlinux-dev-ba71e17269633ea36e776d744d5cc0fcb5a41f93.tar.xz
linux-dev-ba71e17269633ea36e776d744d5cc0fcb5a41f93.zip
Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into sa1100
Diffstat (limited to 'drivers/mfd/ucb1x00-ts.c')
-rw-r--r--drivers/mfd/ucb1x00-ts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index 61b7d3eb9a2f..000cb414a78a 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -30,12 +30,12 @@
#include <linux/freezer.h>
#include <linux/slab.h>
#include <linux/kthread.h>
+#include <linux/mfd/ucb1x00.h>
#include <mach/dma.h>
#include <mach/collie.h>
#include <asm/mach-types.h>
-#include "ucb1x00.h"
struct ucb1x00_ts {