Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141561
b: refs/heads/master
c: 5c2670c
h: refs/heads/master
i:
  141559: 7fb86ee
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 39a1189 commit fe44f2a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: d2755d518620bfa3ab6d25aed4048a2d35868e3d
refs/heads/master: 5c2670cba2a5fd1a27f938ae11b3a24518d999db
10 changes: 5 additions & 5 deletions trunk/drivers/staging/comedi/drivers/cb_pcidas.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ enum trimpot_model {
AD8402,
};

typedef struct cb_pcidas_board_struct {
struct cb_pcidas_board {
const char *name;
unsigned short device_id;
int ai_se_chans; // Inputs in single-ended mode
Expand All @@ -255,9 +255,9 @@ typedef struct cb_pcidas_board_struct {
const struct comedi_lrange *ranges;
enum trimpot_model trimpot;
unsigned has_dac08:1;
} cb_pcidas_board;
};

static const cb_pcidas_board cb_pcidas_boards[] = {
static const struct cb_pcidas_board cb_pcidas_boards[] = {
{
name: "pci-das1602/16",
device_id:0x1,
Expand Down Expand Up @@ -375,7 +375,7 @@ static const cb_pcidas_board cb_pcidas_boards[] = {
};

// Number of boards in cb_pcidas_boards
#define N_BOARDS (sizeof(cb_pcidas_boards) / sizeof(cb_pcidas_board))
#define N_BOARDS (sizeof(cb_pcidas_boards) / sizeof(struct cb_pcidas_board))

static DEFINE_PCI_DEVICE_TABLE(cb_pcidas_pci_table) = {
{PCI_VENDOR_ID_CB, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
Expand All @@ -394,7 +394,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcidas_pci_table);
/*
* Useful for shorthand access to the particular board structure
*/
#define thisboard ((const cb_pcidas_board *)dev->board_ptr)
#define thisboard ((const struct cb_pcidas_board *)dev->board_ptr)

/* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure,
Expand Down

0 comments on commit fe44f2a

Please sign in to comment.