projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6-block.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
imx-uart.h
diff --git
a/arch/arm/plat-mxc/include/mach/imx-uart.h
b/arch/arm/plat-mxc/include/mach/imx-uart.h
index f9bd17dd8dd71af1fd6d6c05f7c7781b51daea26..4adec9b154dd6b91904aad2f542aef1730c22f72 100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/imx-uart.h
+++ b/
arch/arm/plat-mxc/include/mach/imx-uart.h
@@
-24,7
+24,7
@@
struct imxuart_platform_data {
int (*init)(struct platform_device *pdev);
-
int
(*exit)(struct platform_device *pdev);
+
void
(*exit)(struct platform_device *pdev);
unsigned int flags;
void (*irda_enable)(int enable);
unsigned int irda_inv_rx:1;