Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317131
b: refs/heads/master
c: 916d702
h: refs/heads/master
i:
  317129: d497bc6
  317127: 48b0d24
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent 57a5cf3 commit 0a5f26b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 19 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: 62bc23d145d636f0de2bf412dcf31a33fcf16046
refs/heads/master: 916d7028a91a6a0e4b76e7cfb97819f294cbd803
32 changes: 14 additions & 18 deletions trunk/drivers/staging/comedi/drivers/amplc_pc236.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,35 +98,31 @@ enum pc236_model { pc36at_model, pci236_model, anypci_model };

struct pc236_board {
const char *name;
const char *fancy_name;
unsigned short devid;
enum pc236_bustype bustype;
enum pc236_model model;
};
static const struct pc236_board pc236_boards[] = {
#if IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_ISA)
{
.name = "pc36at",
.fancy_name = "PC36AT",
.bustype = isa_bustype,
.model = pc36at_model,
},
.name = "pc36at",
.bustype = isa_bustype,
.model = pc36at_model,
},
#endif
#if IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI)
{
.name = "pci236",
.fancy_name = "PCI236",
.devid = PCI_DEVICE_ID_AMPLICON_PCI236,
.bustype = pci_bustype,
.model = pci236_model,
},
.name = "pci236",
.devid = PCI_DEVICE_ID_AMPLICON_PCI236,
.bustype = pci_bustype,
.model = pci236_model,
},
{
.name = PC236_DRIVER_NAME,
.fancy_name = PC236_DRIVER_NAME,
.devid = PCI_DEVICE_ID_INVALID,
.bustype = pci_bustype,
.model = anypci_model, /* wildcard */
},
.name = PC236_DRIVER_NAME,
.devid = PCI_DEVICE_ID_INVALID,
.bustype = pci_bustype,
.model = anypci_model, /* wildcard */
},
#endif
};

Expand Down

0 comments on commit 0a5f26b

Please sign in to comment.