]> rtime.felk.cvut.cz Git - socketcan-devel.git/commitdiff
Added two missing kernel version depencies.
authorhartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Sun, 28 Feb 2010 14:58:11 +0000 (14:58 +0000)
committerhartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Sun, 28 Feb 2010 14:58:11 +0000 (14:58 +0000)
git-svn-id: svn://svn.berlios.de//socketcan/trunk@1151 030b6a49-0b11-0410-94ab-b0dab22257f2

kernel/2.6/drivers/net/can/softing/softing_cs.c

index b939fdc5b331882adda88686a8fe0282deb57ad2..18c1f964b4222b47fd965e6ca3ace6acdbd05202 100644 (file)
@@ -367,7 +367,11 @@ static int dev_conf_check(struct pcmcia_device *pdev,
                        csdev->win.AccessSpeed = 3;
 #endif
                }
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+               ret = pcmcia_request_window(&pdev, &csdev->win, &pdev->win);
+#else
                ret = pcmcia_request_window(pdev, &csdev->win, &pdev->win);
+#endif
                if (ret) {
                        dev_alert(&pdev->dev,
                                "pcmcia_request_window() mismatch\n");
@@ -375,7 +379,11 @@ static int dev_conf_check(struct pcmcia_device *pdev,
                }
                map.Page = 0;
                map.CardOffset = mem->win[0].card_addr;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+               if (pcmcia_map_mem_page(pdev->win, &map)) {
+#else
                if (pcmcia_map_mem_page(pdev, pdev->win, &map)) {
+#endif
                        dev_alert(&pdev->dev,
                                "pcmcia_map_mem_page() mismatch\n");
                        goto do_next_win;