Merge branch 'pxa-all' into devel

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c

3 files changed, 13 insertions, 29 deletions

diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
index 5fe9588db07..2793447621c 100644
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
@@ -66,14 +66,6 @@ static void it8152_unmask_irq(unsigned int irq)
        }
 }
 
-static inline void it8152_irq(int irq)
-{
-        struct irq_desc *desc;
-
-        desc = irq_desc + irq;
-        desc_handle_irq(irq, desc);
-}
-
 static struct irq_chip it8152_irq_chip = {
         .name           = "it8152",
         .ack            = it8152_mask_irq,
@@ -128,21 +120,21 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
                bits_pd &= ((1 << IT8152_PD_IRQ_COUNT) - 1);
                while (bits_pd) {
                        i = __ffs(bits_pd);
-                       it8152_irq(IT8152_PD_IRQ(i));
+                       generic_handle_irq(IT8152_PD_IRQ(i));
                        bits_pd &= ~(1 << i);
                }
 
                bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1);
                while (bits_lp) {
                        i = __ffs(bits_lp);
-                       it8152_irq(IT8152_LP_IRQ(i));
+                       generic_handle_irq(IT8152_LP_IRQ(i));
                        bits_lp &= ~(1 << i);
                }
 
                bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1);
                while (bits_ld) {
                        i = __ffs(bits_ld);
-                       it8152_irq(IT8152_LD_IRQ(i));
+                       generic_handle_irq(IT8152_LD_IRQ(i));
                        bits_ld &= ~(1 << i);
                }
        }
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 534b23d9586..7c6b4b99a2d 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -169,7 +169,6 @@ static struct locomo_dev_info locomo_devices[] = {
 static void locomo_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         /* Acknowledge the parent IRQ */
@@ -181,10 +180,9 @@ static void locomo_handler(unsigned int irq, struct irq_desc *desc)
         if (req) {
                 /* generate the next interrupt(s) */
                 irq = LOCOMO_IRQ_START;
-                d = irq_desc + irq;
-                for (i = 0; i <= 3; i++, d++, irq++) {
+                for (i = 0; i <= 3; i++, irq++) {
                         if (req & (0x0100 << i)) {
-                                desc_handle_irq(irq, d);
+                                generic_handle_irq(irq);
                         }
 
                 }
@@ -222,12 +220,10 @@ static struct irq_chip locomo_chip = {
 
 static void locomo_key_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {
-                d = irq_desc + LOCOMO_IRQ_KEY_START;
-                desc_handle_irq(LOCOMO_IRQ_KEY_START, d);
+                generic_handle_irq(LOCOMO_IRQ_KEY_START);
         }
 }
 
@@ -268,7 +264,6 @@ static struct irq_chip locomo_key_chip = {
 static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         req =   locomo_readl(mapbase + LOCOMO_GIR) &
@@ -277,10 +272,9 @@ static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)
 
         if (req) {
                 irq = LOCOMO_IRQ_GPIO_START;
-                d = irq_desc + LOCOMO_IRQ_GPIO_START;
-                for (i = 0; i <= 15; i++, irq++, d++) {
+                for (i = 0; i <= 15; i++, irq++) {
                         if (req & (0x0001 << i)) {
-                                desc_handle_irq(irq, d);
+                                generic_handle_irq(irq);
                         }
                 }
         }
@@ -361,12 +355,10 @@ static struct irq_chip locomo_gpio_chip = {
 
 static void locomo_lt_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {
-                d = irq_desc + LOCOMO_IRQ_LT_START;
-                desc_handle_irq(LOCOMO_IRQ_LT_START, d);
+                generic_handle_irq(LOCOMO_IRQ_LT_START);
         }
 }
 
@@ -407,17 +399,15 @@ static struct irq_chip locomo_lt_chip = {
 static void locomo_spi_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         req = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIR) & 0x000F;
         if (req) {
                 irq = LOCOMO_IRQ_SPI_START;
-                d = irq_desc + irq;
 
-                for (i = 0; i <= 3; i++, irq++, d++) {
+                for (i = 0; i <= 3; i++, irq++) {
                         if (req & (0x0001 << i)) {
-                                desc_handle_irq(irq, d);
+                                generic_handle_irq(irq);
                         }
                 }
         }
diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c
index aad4d94ba8f..d56c932580e 100644
--- a/arch/arm/common/sharpsl_param.c
+++ b/arch/arm/common/sharpsl_param.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/string.h>
 #include <asm/mach/sharpsl_param.h>
 
@@ -36,6 +37,7 @@
 #define PHAD_MAGIC      MAGIC_CHG('P','H','A','D')
 
 struct sharpsl_param_info sharpsl_param;
+EXPORT_SYMBOL(sharpsl_param);
 
 void sharpsl_save_param(void)
 {