xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

Browse Source 
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  mmc_spi: Fix unterminated of_match_table
  of/sparc: fix build regression from of_device changes
  of/device: Replace struct of_device with struct platform_device
This commit is contained in:
Linus Torvalds
2010-08-12 09:11:31 -07:00
parent 26f0cf9181 fbe0f8348f
commit 58d4ea65b9
159 changed files with 523 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/hw/ehca/ehca_main.c
View File

@@ -713,7 +713,7 @@ static struct attribute_group ehca_dev_attr_grp = {
.attrs = ehca_dev_attrs
};
static int __devinit ehca_probe(struct of_device *dev,
static int __devinit ehca_probe(struct platform_device *dev,
const struct of_device_id *id)
{
struct ehca_shca *shca;
@@ -879,7 +879,7 @@ probe1:
return -EINVAL;
}
static int __devexit ehca_remove(struct of_device *dev)
static int __devexit ehca_remove(struct platform_device *dev)
{
struct ehca_shca *shca = dev_get_drvdata(&dev->dev);
unsigned long flags;