summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/chips/menelaus.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-20 12:39:18 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-20 12:39:18 +0200
commit170465ee7f5a9a2d0ac71285507e52642e040353 (patch)
treedbca81f04cde9e625170abbd6a72555cfbeb194e /drivers/i2c/chips/menelaus.c
parentxen_alloc_ptpage: cast PFN_PHYS() argument to unsigned long (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff)
downloadlinux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz
linux-170465ee7f5a9a2d0ac71285507e52642e040353.zip
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/i2c/chips/menelaus.c')
-rw-r--r--drivers/i2c/chips/menelaus.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index b36db1797c11..176126d3a01d 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -41,11 +41,10 @@
#include <linux/rtc.h>
#include <linux/bcd.h>
-#include <asm/mach-types.h>
#include <asm/mach/irq.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/menelaus.h>
+#include <mach/gpio.h>
+#include <mach/menelaus.h>
#define DRIVER_NAME "menelaus"