git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
ide
/
pci
/
triflex.c
diff --git
a/drivers/ide/pci/triflex.c
b/drivers/ide/pci/triflex.c
index
f7ff2f4
..
fc61865
100644
(file)
--- a/
drivers/ide/pci/triflex.c
+++ b/
drivers/ide/pci/triflex.c
@@
-220,13
+220,9
@@
static unsigned int __init init_chipset_triflex(struct pci_dev *dev,
static int __devinit triflex_init_one(struct pci_dev *dev,
const struct pci_device_id *id)
{
static int __devinit triflex_init_one(struct pci_dev *dev,
const struct pci_device_id *id)
{
- ide_pci_device_t *d = &triflex_devices[id->driver_data];
- if (dev->device != d->device)
- BUG();
-
- ide_setup_pci_device(dev, d);
+ ide_setup_pci_device(dev, &triflex_devices[id->driver_data]);
triflex_dev = dev;
triflex_dev = dev;
-
+
return 0;
}
return 0;
}