diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:39:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:39:02 -0800 |
| commit | f341dddf1dadf64be309791f83d7904245f1261d (patch) | |
| tree | 974c9e1f23da6743532162fd86cf019da497eaff /drivers/staging/phison | |
| parent | eaa5eec739637f32f8733d528ff0b94fd62b1214 (diff) | |
| parent | b02957d58a27525499ab10d272d3b44682a7ae50 (diff) | |
| download | linux-f341dddf1dadf64be309791f83d7904245f1261d.tar.gz linux-f341dddf1dadf64be309791f83d7904245f1261d.tar.bz2 linux-f341dddf1dadf64be309791f83d7904245f1261d.zip | |
Staging: merge staging patches into Linus's main branch
There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch. This merge resolves those merge conflicts.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/phison')
| -rw-r--r-- | drivers/staging/phison/phison.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c index fcba78d21636..0c495eacb75b 100644 --- a/drivers/staging/phison/phison.c +++ b/drivers/staging/phison/phison.c @@ -69,7 +69,7 @@ static int phison_init_one(struct pci_dev *pdev, const struct pci_device_id *id) return ret; } -static struct pci_device_id phison_pci_tbl[] = { +static const struct pci_device_id phison_pci_tbl[] = { { PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 }, { 0, }, |