git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
scx200_acb.c
diff --git
a/drivers/i2c/busses/scx200_acb.c
b/drivers/i2c/busses/scx200_acb.c
index
4cb4bb0
..
53fab51
100644
(file)
--- a/
drivers/i2c/busses/scx200_acb.c
+++ b/
drivers/i2c/busses/scx200_acb.c
@@
-560,7
+560,8
@@
static const struct pci_device_id scx200_pci[] __initconst = {
{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA),
.driver_data = 1 },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA),
- .driver_data = 2 }
+ .driver_data = 2 },
+ { 0, }
};
static struct {