git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull sbs into release branch
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
idp.c
diff --git
a/arch/arm/mach-pxa/idp.c
b/arch/arm/mach-pxa/idp.c
index
a4cb875
..
465108d
100644
(file)
--- a/
arch/arm/mach-pxa/idp.c
+++ b/
arch/arm/mach-pxa/idp.c
@@
-38,6
+38,7
@@
#include <asm/arch/mmc.h>
#include "generic.h"
#include <asm/arch/mmc.h>
#include "generic.h"
+#include "devices.h"
/* TODO:
* - add pxa2xx_audio_ops_t device structure
/* TODO:
* - add pxa2xx_audio_ops_t device structure
@@
-125,7
+126,7
@@
static struct pxafb_mach_info sharp_lm8v31 = {
.pxafb_lcd_power = &idp_lcd_power
};
.pxafb_lcd_power = &idp_lcd_power
};
-static int idp_mci_init(struct device *dev, irq
return_t (*idp_detect_int)(int, void *)
, void *data)
+static int idp_mci_init(struct device *dev, irq
_handler_t idp_detect_int
, void *data)
{
/* setup GPIO for PXA25x MMC controller */
pxa_gpio_mode(GPIO6_MMCCLK_MD);
{
/* setup GPIO for PXA25x MMC controller */
pxa_gpio_mode(GPIO6_MMCCLK_MD);
@@
-152,7
+153,7
@@
static void __init idp_init(void)
static void __init idp_init_irq(void)
{
static void __init idp_init_irq(void)
{
- pxa_init_irq();
+ pxa
25x
_init_irq();
set_irq_type(TOUCH_PANEL_IRQ, TOUCH_PANEL_IRQ_EDGE);
}
set_irq_type(TOUCH_PANEL_IRQ, TOUCH_PANEL_IRQ_EDGE);
}