diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-23 18:06:37 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-23 18:06:37 +0000 |
| commit | 40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb (patch) | |
| tree | 0d949c487ba15c4c8198a69cd7b8c0cdb5773af4 /arch/arm/mach-pxa/am200epd.c | |
| parent | d83a12a40915774332cec625856c2e7ba9033e15 (diff) | |
| parent | 3b24f30c4f678cfab5c6d090af9559fefa37cc41 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/am200epd.c
arch/arm/mach-pxa/ezx.c
Diffstat (limited to 'arch/arm/mach-pxa/am200epd.c')
| -rw-r--r-- | arch/arm/mach-pxa/am200epd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c index 3a4f8d855a5..77ee80e5e47 100644 --- a/arch/arm/mach-pxa/am200epd.c +++ b/arch/arm/mach-pxa/am200epd.c @@ -344,7 +344,7 @@ static unsigned long am200_pin_config[] __initdata = { GPIO16_GPIO, }; -static int __init am200_init(void) +int __init am200_init(void) { int ret; @@ -382,8 +382,6 @@ static int __init am200_init(void) module_param(panel_type, uint, 0); MODULE_PARM_DESC(panel_type, "Select the panel type: 6, 8, 97"); -module_init(am200_init); - MODULE_DESCRIPTION("board driver for am200 metronome epd kit"); MODULE_AUTHOR("Jaya Kumar"); MODULE_LICENSE("GPL"); |