diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /arch/arm/mach-pxa/tosa.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 249353616aba..7915a5a22865 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
| @@ -174,7 +174,7 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = { | |||
| 174 | */ | 174 | */ |
| 175 | static struct pxamci_platform_data tosa_mci_platform_data; | 175 | static struct pxamci_platform_data tosa_mci_platform_data; |
| 176 | 176 | ||
| 177 | static int tosa_mci_init(struct device *dev, irqreturn_t (*tosa_detect_int)(int, void *, struct pt_regs *), void *data) | 177 | static int tosa_mci_init(struct device *dev, irq_handler_t tosa_detect_int, void *data) |
| 178 | { | 178 | { |
| 179 | int err; | 179 | int err; |
| 180 | 180 | ||