diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 13:03:54 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 13:03:54 -0600 |
| commit | ae7daa48c5678352fd5f6d5fa0ae6f82f3482624 (patch) | |
| tree | 18ca8b28f04556b29105e6792e0db0c56612341a /include | |
| parent | 1df8fcbbfb72dd76307e70f254e8bf8af1ba8762 (diff) | |
Update the port of MXC drivers from the 2.6.18 kernel to 2.6.19.2.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-porting-3.patch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-mxc/gpio.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-mxc/hardware.h | 15 | ||||
| -rw-r--r-- | include/asm-arm/arch-mxc/ipu.h | 2 |
3 files changed, 2 insertions, 17 deletions
diff --git a/include/asm-arm/arch-mxc/gpio.h b/include/asm-arm/arch-mxc/gpio.h index b72f13028b45..4557f7b13c9e 100644 --- a/include/asm-arm/arch-mxc/gpio.h +++ b/include/asm-arm/arch-mxc/gpio.h @@ -63,7 +63,7 @@ typedef enum gpio_int_cfg { #endif } gpio_edge_t; -typedef irqreturn_t(*gpio_irq_handler) (int, void *, struct pt_regs *); +typedef irqreturn_t(*gpio_irq_handler) (int, void *); /*! * This function configures the GPIO signal to be either input or output. For diff --git a/include/asm-arm/arch-mxc/hardware.h b/include/asm-arm/arch-mxc/hardware.h index b8eea8722831..83f52c7dc2d0 100644 --- a/include/asm-arm/arch-mxc/hardware.h +++ b/include/asm-arm/arch-mxc/hardware.h @@ -23,21 +23,6 @@ #include <asm/sizes.h> /*! - * makes bool as int type - */ -#define bool int - -/*! - * defines false as 0 - */ -#define false 0 - -/*! - * defines true as 1 - */ -#define true 1 - -/*! * defines PCIO_BASE (not used but needed for compilation) */ #define PCIO_BASE 0 diff --git a/include/asm-arm/arch-mxc/ipu.h b/include/asm-arm/arch-mxc/ipu.h index fbfd7b15dc63..60d0ec96430d 100644 --- a/include/asm-arm/arch-mxc/ipu.h +++ b/include/asm-arm/arch-mxc/ipu.h @@ -688,7 +688,7 @@ void ipu_enable_irq(uint32_t irq); void ipu_disable_irq(uint32_t irq); void ipu_clear_irq(uint32_t irq); int ipu_request_irq(uint32_t irq, - irqreturn_t(*handler) (int, void *, struct pt_regs *), + irqreturn_t(*handler) (int, void *), uint32_t irq_flags, const char *devname, void *dev_id); void ipu_free_irq(uint32_t irq, void *dev_id); bool ipu_get_irq_status(uint32_t irq); |