]> git.karo-electronics.de Git - linux-beck.git/commitdiff
rt2x00: fix rt2800pci compilation with SoC
authorHelmut Schaa <helmut.schaa@googlemail.com>
Tue, 2 Mar 2010 15:34:49 +0000 (16:34 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 2 Mar 2010 19:31:37 +0000 (14:31 -0500)
Compiling rt2800pci with CONFIG_RT2800PCI_SOC fails with "... rt2880pci.c:
error: incompatible type for argument 2 of 'rt2x00soc_probe'".

Fix this by using &rt2800pci_ops instead of rt2800pci_ops.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2800pci.c

index aca8c124f43458952275d72cbc51e460ce63a827..91cce2d0f6dbca20a6dc63fa96c9bf3015e1d771 100644 (file)
@@ -1225,7 +1225,7 @@ MODULE_LICENSE("GPL");
 #ifdef CONFIG_RT2800PCI_SOC
 static int rt2800soc_probe(struct platform_device *pdev)
 {
-       return rt2x00soc_probe(pdev, rt2800pci_ops);
+       return rt2x00soc_probe(pdev, &rt2800pci_ops);
 }
 
 static struct platform_driver rt2800soc_driver = {