projects
/
firefly-linux-kernel-4.4.55.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 git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pcmcia
/
pxa2xx_sharpsl.c
diff --git
a/drivers/pcmcia/pxa2xx_sharpsl.c
b/drivers/pcmcia/pxa2xx_sharpsl.c
index 7dd879ce514df8cffdf23de397923fb96e878eef..89ebd8c7663691dadf2c74f6b60eb7da5a8a55ed 100644
(file)
--- a/
drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/
drivers/pcmcia/pxa2xx_sharpsl.c
@@
-208,7
+208,7
@@
static struct pcmcia_low_level sharpsl_pcmcia_ops = {
#ifdef CONFIG_SA1100_COLLIE
#include "sa11xx_base.h"
-int
__devinit
pcmcia_collie_init(struct device *dev)
+int pcmcia_collie_init(struct device *dev)
{
int ret = -ENODEV;