diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2011-06-15 21:31:01 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-06-15 21:31:01 +0000 |
commit | a3c7fb6d3956d979f8fc3b770b73fe5c3cd0f741 (patch) | |
tree | ddcbfa29bdb1ce96cc700e7ed428a098053ecf8f /target/linux/generic/patches-3.0/860-01_hotpluggable_spi_gpio.patch | |
parent | 2e55411ec7cfe7a8198b9c2a2ba771600ec882a9 (diff) | |
download | upstream-a3c7fb6d3956d979f8fc3b770b73fe5c3cd0f741.tar.gz upstream-a3c7fb6d3956d979f8fc3b770b73fe5c3cd0f741.tar.bz2 upstream-a3c7fb6d3956d979f8fc3b770b73fe5c3cd0f741.zip |
linux/generic: Add support for 3.0-rc3
Also make linux identify itself properly as 3.0, not 3.0.0.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27191 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/860-01_hotpluggable_spi_gpio.patch')
-rw-r--r-- | target/linux/generic/patches-3.0/860-01_hotpluggable_spi_gpio.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/860-01_hotpluggable_spi_gpio.patch b/target/linux/generic/patches-3.0/860-01_hotpluggable_spi_gpio.patch new file mode 100644 index 0000000000..f8e6374fa7 --- /dev/null +++ b/target/linux/generic/patches-3.0/860-01_hotpluggable_spi_gpio.patch @@ -0,0 +1,60 @@ +Fix spi-gpio for hotplug. + +--mb + + + +--- a/drivers/spi/spi_gpio.c ++++ b/drivers/spi/spi_gpio.c +@@ -255,7 +255,7 @@ static void spi_gpio_cleanup(struct spi_ + spi_bitbang_cleanup(spi); + } + +-static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in) ++static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in) + { + int value; + +@@ -269,7 +269,7 @@ static int __init spi_gpio_alloc(unsigne + return value; + } + +-static int __init ++static int __devinit + spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label, + u16 *res_flags) + { +@@ -311,7 +311,7 @@ done: + return value; + } + +-static int __init spi_gpio_probe(struct platform_device *pdev) ++static int __devinit spi_gpio_probe(struct platform_device *pdev) + { + int status; + struct spi_master *master; +@@ -379,7 +379,7 @@ gpio_free: + return status; + } + +-static int __exit spi_gpio_remove(struct platform_device *pdev) ++static int __devexit spi_gpio_remove(struct platform_device *pdev) + { + struct spi_gpio *spi_gpio; + struct spi_gpio_platform_data *pdata; +@@ -408,12 +408,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME); + static struct platform_driver spi_gpio_driver = { + .driver.name = DRIVER_NAME, + .driver.owner = THIS_MODULE, +- .remove = __exit_p(spi_gpio_remove), ++ .probe = spi_gpio_probe, ++ .remove = __devexit_p(spi_gpio_remove), + }; + + static int __init spi_gpio_init(void) + { +- return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe); ++ return platform_driver_register(&spi_gpio_driver); + } + module_init(spi_gpio_init); + |