Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354255
b: refs/heads/master
c: 4fc76ea
h: refs/heads/master
i:
  354253: 125519b
  354251: 4212127
  354247: 28b251c
  354239: 0e89c24
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 30, 2013
1 parent 11c3655 commit 471427e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: deead9d973f4e225447f77bc4f128864fefd9a88
refs/heads/master: 4fc76ea03f5f847e7c70cd81849b2c825119ef78
14 changes: 0 additions & 14 deletions trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}

static void labpc_config(struct pcmcia_device *link);
static int labpc_cs_suspend(struct pcmcia_device *p_dev);
static int labpc_cs_resume(struct pcmcia_device *p_dev);

static int labpc_cs_attach(struct pcmcia_device *);
static void labpc_cs_detach(struct pcmcia_device *);
Expand Down Expand Up @@ -233,16 +231,6 @@ static void labpc_config(struct pcmcia_device *link)
pcmcia_disable_device(link);
}

static int labpc_cs_suspend(struct pcmcia_device *link)
{
return 0;
} /* labpc_cs_suspend */

static int labpc_cs_resume(struct pcmcia_device *link)
{
return 0;
} /* labpc_cs_resume */

static const struct pcmcia_device_id labpc_cs_ids[] = {
/* N.B. These IDs should match those in labpc_cs_boards (ni_labpc.c) */
PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0103), /* daqcard-1200 */
Expand All @@ -256,8 +244,6 @@ static struct pcmcia_driver labpc_cs_driver = {
.id_table = labpc_cs_ids,
.probe = labpc_cs_attach,
.remove = labpc_cs_detach,
.suspend = labpc_cs_suspend,
.resume = labpc_cs_resume,
};
module_comedi_pcmcia_driver(driver_labpc_cs, labpc_cs_driver);

Expand Down

0 comments on commit 471427e

Please sign in to comment.