aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2009-01-27 14:38:39 +0000
committerAndy Green <agreen@octopus.localdomain>2009-01-27 14:38:39 +0000
commitd5c7291ce4933145a515df22655a9b35f425ae16 (patch)
treecf27a9f198508819970e0d088f243844f893198a
parent9b1276e016a34d423a9b060772ee43104f26260e (diff)
clean-rebase-dust-29-rc2.patch
Signed-off-by: Andy Green <andy@openmoko.com>
-rw-r--r--arch/arm/mach-s3c2410/include/mach/gpio.h1
-rw-r--r--arch/arm/mach-s3c2410/include/mach/spi-gpio.h1
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c3
-rw-r--r--arch/arm/plat-s3c24xx/include/plat/irq.h1
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h
index c89909bd53a..7fe849d13f7 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
@@ -25,7 +25,6 @@
/* These two defines should be removed as soon as the
* generic irq handling makes it upstream */
#include <mach/hardware.h>
-#define gpio_to_irq(gpio) s3c2410_gpio_getirq(gpio)
#define irq_to_gpio(irq) s3c2410_gpio_irq2pin(irq)
/* -- cut to here when generic irq makes it */
diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
index af071ae2e63..2d229da0e55 100644
--- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
@@ -20,7 +20,6 @@ struct s3c2410_spigpio_info {
int num_chipselect;
int bus_num;
- int num_chipselect;
/*
* FIXME: board_size and board_info DO NOT belong here.
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index a2fe7e99718..0b7ff25f8fb 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -45,7 +45,6 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
-#include <linux/pcf50633.h>
#include <linux/lis302dl.h>
#include <asm/mach/arch.h>
@@ -99,6 +98,8 @@
#include <../drivers/input/touchscreen/ts_filter_median.h>
#include <../drivers/input/touchscreen/ts_filter_group.h>
+#include <linux/mfd/pcf50633/core.h>
+
/* arbitrates which sensor IRQ owns the shared SPI bus */
static spinlock_t motion_irq_lock;
diff --git a/arch/arm/plat-s3c24xx/include/plat/irq.h b/arch/arm/plat-s3c24xx/include/plat/irq.h
index 48fb56456b5..11a866466d8 100644
--- a/arch/arm/plat-s3c24xx/include/plat/irq.h
+++ b/arch/arm/plat-s3c24xx/include/plat/irq.h
@@ -12,6 +12,7 @@
#include <linux/io.h>
+#include <mach/irqs.h>
#include <mach/hardware.h>
#include <mach/regs-irq.h>
#include <mach/regs-gpio.h>