target/linux/mpc83xx/patches-2.6.36/036-pata_rbppc_fix.patch

   1 --- a/drivers/ata/pata_rbppc_cf.c
   2 +++ b/drivers/ata/pata_rbppc_cf.c
   3 @@ -15,6 +15,7 @@
   4  #include <linux/libata.h>
   5  #include <linux/of_platform.h>
   6  #include <linux/ata_platform.h>
   7 +#include <linux/slab.h>
   8
   9  #define DEBUG_UPM      0
  10
  11 @@ -510,7 +511,7 @@ static struct ata_port_operations rbppc_
  12         .sff_irq_clear          = rbppc_cf_dummy_noret,
  13  };
  14
  15 -static int rbppc_cf_init_info(struct of_device *pdev, struct rbppc_cf_info *info) {
  16 +static int rbppc_cf_init_info(struct platform_device *pdev, struct rbppc_cf_info *info) {
  17         struct device_node *np;
  18         struct resource res;
  19         const u32 *u32ptr;
  20 @@ -579,7 +580,7 @@ static int rbppc_cf_init_info(struct of_
  21         return 0;
  22  }
  23
  24 -static int rbppc_cf_probe(struct of_device *pdev,
  25 +static int rbppc_cf_probe(struct platform_device *pdev,
  26                           const struct of_device_id *match)
  27  {
  28         struct ata_host *host;
  29 @@ -654,7 +655,7 @@ err_info:
  30         return err;
  31  }
  32
  33 -static int rbppc_cf_remove(struct of_device *pdev)
  34 +static int rbppc_cf_remove(struct platform_device *pdev)
  35  {
  36         struct device *dev = &pdev->dev;
  37         struct ata_host *host = dev_get_drvdata(dev);