Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317143
b: refs/heads/master
c: 6ac6825
h: refs/heads/master
i:
  317141: f45555a
  317139: 951c89b
  317135: b672e34
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent 017562c commit 62ca9d5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 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: 03668b101362b031b74a7cde865fa7346b44eb30
refs/heads/master: 6ac682520ec3318f0a43582f642c0444ad5e3314
4 changes: 0 additions & 4 deletions trunk/drivers/staging/comedi/drivers/amplc_pc263.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ enum pc263_model { pc263_model, pci263_model, anypci_model };

struct pc263_board {
const char *name;
const char *fancy_name;
unsigned short devid;
enum pc263_bustype bustype;
enum pc263_model model;
Expand All @@ -74,22 +73,19 @@ static const struct pc263_board pc263_boards[] = {
#if IS_ENABLED(CONFIG_COMEDI_AMPLC_PC263_ISA)
{
.name = "pc263",
.fancy_name = "PC263",
.bustype = isa_bustype,
.model = pc263_model,
},
#endif
#if IS_ENABLED(CONFIG_COMEDI_AMPLC_PC263_PCI)
{
.name = "pci263",
.fancy_name = "PCI263",
.devid = PCI_DEVICE_ID_AMPLICON_PCI263,
.bustype = pci_bustype,
.model = pci263_model,
},
{
.name = PC263_DRIVER_NAME,
.fancy_name = PC263_DRIVER_NAME,
.devid = PCI_DEVICE_ID_INVALID,
.bustype = pci_bustype,
.model = anypci_model, /* wildcard */
Expand Down

0 comments on commit 62ca9d5

Please sign in to comment.