aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/teles_cs.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-01-15 15:05:59 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-15 15:05:59 -0500
commit4b87f922598acf91eee18f71688a33f54f57bcde (patch)
tree9cdfe30c6b96c47093da5392ed82d147290cd64c /drivers/isdn/hisax/teles_cs.c
parent55eb555d9674e2ebe9d4de0146602f96ff18e7d6 (diff)
parentdaf3ec688e057f6060fb9bb0819feac7a8bbf45c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/hisax/teles_cs.c')
-rw-r--r--drivers/isdn/hisax/teles_cs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 4deac451807c..f2476ffb04fd 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -43,9 +43,9 @@ MODULE_LICENSE("GPL");
43static int protocol = 2; /* EURO-ISDN Default */ 43static int protocol = 2; /* EURO-ISDN Default */
44module_param(protocol, int, 0); 44module_param(protocol, int, 0);
45 45
46static int teles_cs_config(struct pcmcia_device *link) __devinit; 46static int teles_cs_config(struct pcmcia_device *link);
47static void teles_cs_release(struct pcmcia_device *link); 47static void teles_cs_release(struct pcmcia_device *link);
48static void teles_detach(struct pcmcia_device *p_dev) __devexit; 48static void teles_detach(struct pcmcia_device *p_dev);
49 49
50typedef struct local_info_t { 50typedef struct local_info_t {
51 struct pcmcia_device *p_dev; 51 struct pcmcia_device *p_dev;
@@ -53,7 +53,7 @@ typedef struct local_info_t {
53 int cardnr; 53 int cardnr;
54} local_info_t; 54} local_info_t;
55 55
56static int __devinit teles_probe(struct pcmcia_device *link) 56static int teles_probe(struct pcmcia_device *link)
57{ 57{
58 local_info_t *local; 58 local_info_t *local;
59 59
@@ -72,7 +72,7 @@ static int __devinit teles_probe(struct pcmcia_device *link)
72 return teles_cs_config(link); 72 return teles_cs_config(link);
73} /* teles_attach */ 73} /* teles_attach */
74 74
75static void __devexit teles_detach(struct pcmcia_device *link) 75static void teles_detach(struct pcmcia_device *link)
76{ 76{
77 local_info_t *info = link->priv; 77 local_info_t *info = link->priv;
78 78
@@ -108,7 +108,7 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
108 return -ENODEV; 108 return -ENODEV;
109} 109}
110 110
111static int __devinit teles_cs_config(struct pcmcia_device *link) 111static int teles_cs_config(struct pcmcia_device *link)
112{ 112{
113 int i; 113 int i;
114 IsdnCard_t icard; 114 IsdnCard_t icard;
@@ -192,7 +192,7 @@ static struct pcmcia_driver teles_cs_driver = {
192 .owner = THIS_MODULE, 192 .owner = THIS_MODULE,
193 .name = "teles_cs", 193 .name = "teles_cs",
194 .probe = teles_probe, 194 .probe = teles_probe,
195 .remove = __devexit_p(teles_detach), 195 .remove = teles_detach,
196 .id_table = teles_ids, 196 .id_table = teles_ids,
197 .suspend = teles_suspend, 197 .suspend = teles_suspend,
198 .resume = teles_resume, 198 .resume = teles_resume,