ixp4xx: port 600-skb_avoid_dmabounce.patch to 2.6.33 & 2.6.35

[openwrt.git] / target / linux / atheros / patches-2.6.33 / 110-ar2313_ethernet.patch

diff --git a/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch
index 6f511a7..6ce948e 100644 (file)
--- a/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch
@@ -355,7 +355,7 @@
 +      tasklet_kill(&sp->rx_tasklet);
 +}
 +
 +      tasklet_kill(&sp->rx_tasklet);
 +}
 +

-+static int __exit ar231x_remove(struct platform_device *pdev)
++static int __devexit ar231x_remove(struct platform_device *pdev)

 +{
 +      struct net_device *dev = platform_get_drvdata(pdev);
 +      struct ar231x_private *sp = netdev_priv(dev);
 +{
 +      struct net_device *dev = platform_get_drvdata(pdev);
 +      struct ar231x_private *sp = netdev_priv(dev);


@@ -392,7 +392,7 @@
 +static struct platform_driver ar231x_driver = {
 +      .driver.name = "ar231x-eth",
 +      .probe = ar231x_probe,
 +static struct platform_driver ar231x_driver = {
 +      .driver.name = "ar231x-eth",
 +      .probe = ar231x_probe,

-+      .remove = ar231x_remove,
++      .remove = __devexit_p(ar231x_remove),

 +};
 +
 +int __init ar231x_module_init(void)
 +};
 +
 +int __init ar231x_module_init(void)


@@ -1311,7 +1311,7 @@
 +#ifndef _AR2313_H_
 +#define _AR2313_H_
 +
 +#ifndef _AR2313_H_
 +#define _AR2313_H_
 +

-+#include <linux/autoconf.h>
++#include <generated/autoconf.h>

 +#include <linux/bitops.h>
 +#include <asm/bootinfo.h>
 +#include <ar231x_platform.h>
 +#include <linux/bitops.h>
 +#include <asm/bootinfo.h>
 +#include <ar231x_platform.h>