diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-17 21:04:45 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-17 21:04:45 +0100 |
commit | c613bbba6f39c8804f1f26e96fb68a117cc9e282 (patch) | |
tree | 85fbc24f26b61ce4e7a908d18952e3abc1f5cd10 /drivers/pcmcia | |
parent | Merge branch 'hsmmc-init' of git://git.kernel.org/pub/scm/linux/kernel/git/tm... (diff) | |
parent | i.MX Framebuffer: add TFT support (diff) | |
download | linux-c613bbba6f39c8804f1f26e96fb68a117cc9e282.tar.xz linux-c613bbba6f39c8804f1f26e96fb68a117cc9e282.zip |
Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/bfin_cf_pcmcia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c index bb7338863fb9..b59d4115d20f 100644 --- a/drivers/pcmcia/bfin_cf_pcmcia.c +++ b/drivers/pcmcia/bfin_cf_pcmcia.c @@ -334,6 +334,6 @@ static void __exit bfin_cf_exit(void) module_init(bfin_cf_init); module_exit(bfin_cf_exit); -MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>") +MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver"); MODULE_LICENSE("GPL"); |