aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/mcp-sa11x0.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-11-02 18:15:43 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2005-11-02 18:15:43 +1100
commit2be7a906752abf8dce9350c23b6d1036049a5d3e (patch)
treeef178fa5801bdce24938819086662bb747d8c0c2 /drivers/mfd/mcp-sa11x0.c
parentaaf8a7a2949481482200686c7bd3852e5be2e093 (diff)
parentfbf1769d08a8b085834dceb228540153ac2cd534 (diff)
downloadkernel_samsung_aries-2be7a906752abf8dce9350c23b6d1036049a5d3e.zip
kernel_samsung_aries-2be7a906752abf8dce9350c23b6d1036049a5d3e.tar.gz
kernel_samsung_aries-2be7a906752abf8dce9350c23b6d1036049a5d3e.tar.bz2
Merge Paulus' tree
Diffstat (limited to 'drivers/mfd/mcp-sa11x0.c')
-rw-r--r--drivers/mfd/mcp-sa11x0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index 720e7a3..7daa0ed 100644
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -18,7 +18,7 @@
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <asm/dma.h>
#include <asm/hardware.h>