aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/uio/uio_cif.c
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2009-05-11 12:44:27 +0000
committerIngo Molnar <[email protected]>2009-05-11 12:44:31 +0000
commit41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch)
tree51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/uio/uio_cif.c
parentx86 gart: reimplement IOMMU_LEAK feature by using DMA_API_DEBUG (diff)
parentLinux 2.6.30-rc5 (diff)
downloadkernel-41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51.tar.gz
kernel-41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51.zip
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base, update it to .30-rc5 to refresh. Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/uio/uio_cif.c')
-rw-r--r--drivers/uio/uio_cif.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
index c60b8fcf0e3e..28034c812914 100644
--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
@@ -147,5 +147,6 @@ static void __exit hilscher_exit_module(void)
module_init(hilscher_init_module);
module_exit(hilscher_exit_module);
+MODULE_DEVICE_TABLE(pci, hilscher_pci_ids);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Hans J. Koch, Benedikt Spranger");