aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-17 15:04:45 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-17 15:04:45 -0500
commitc613bbba6f39c8804f1f26e96fb68a117cc9e282 (patch)
tree85fbc24f26b61ce4e7a908d18952e3abc1f5cd10 /drivers/pcmcia
parentcd4348339c21f4a15c01f3f120e92b3224a0a7da (diff)
parent80eee6bca4069c48247005aa07cb5e8e86042aa3 (diff)
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.c2
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)
334module_init(bfin_cf_init); 334module_init(bfin_cf_init);
335module_exit(bfin_cf_exit); 335module_exit(bfin_cf_exit);
336 336
337MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>") 337MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
338MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver"); 338MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver");
339MODULE_LICENSE("GPL"); 339MODULE_LICENSE("GPL");