diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-11-16 16:32:55 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2012-11-16 16:32:55 +0000 |
commit | a4c205011b62f45e116eb26c974fa3bd771ce194 (patch) | |
tree | 123b05cb192785d0fc45c1f0acd0e6f8cba68144 /target/linux/leon/patches-2.6.36/016-ioport_update.patch | |
parent | 974b9f5c9a7322424d5127dbe45236a0658c69ba (diff) | |
download | mtk-20170518-a4c205011b62f45e116eb26c974fa3bd771ce194.zip mtk-20170518-a4c205011b62f45e116eb26c974fa3bd771ce194.tar.gz mtk-20170518-a4c205011b62f45e116eb26c974fa3bd771ce194.tar.bz2 |
move patches to patches-2.6.36
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 34220
Diffstat (limited to 'target/linux/leon/patches-2.6.36/016-ioport_update.patch')
-rw-r--r-- | target/linux/leon/patches-2.6.36/016-ioport_update.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/target/linux/leon/patches-2.6.36/016-ioport_update.patch b/target/linux/leon/patches-2.6.36/016-ioport_update.patch new file mode 100644 index 0000000..130b36e --- /dev/null +++ b/target/linux/leon/patches-2.6.36/016-ioport_update.patch @@ -0,0 +1,51 @@ +From 36cad96a50eb877d0c5cb3d8d93c1807ad9c774c Mon Sep 17 00:00:00 2001 +From: Daniel Hellstrom <daniel@gaisler.com> +Date: Wed, 1 Dec 2010 09:37:23 +0100 +Subject: [PATCH] Fix kristoffers ioport.c patch for more recent kernel. + +Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> +--- + arch/sparc/include/asm/dma-mapping.h | 13 +------------ + arch/sparc/kernel/ioport.c | 3 ++- + 2 files changed, 3 insertions(+), 13 deletions(-) + +--- a/arch/sparc/include/asm/dma-mapping.h ++++ b/arch/sparc/include/asm/dma-mapping.h +@@ -51,17 +51,6 @@ static inline int dma_mapping_error(stru + return (dma_addr == DMA_ERROR_CODE); + } + +-static inline int dma_set_mask(struct device *dev, u64 mask) +-{ +-#ifdef CONFIG_PCI +- if (dev->bus == &pci_bus_type) { +- if (!dev->dma_mask || !dma_supported(dev, mask)) +- return -EINVAL; +- *dev->dma_mask = mask; +- return 0; +- } +-#endif +- return -EINVAL; +-} ++extern int dma_set_mask(struct device *dev, u64 dma_mask); + + #endif +--- a/arch/sparc/kernel/ioport.c ++++ b/arch/sparc/kernel/ioport.c +@@ -301,7 +301,7 @@ static void *sbus_alloc_coherent(struct + goto err_nova; + } + #endif +- res->name = op->node->name; ++ res->name = op->dev.of_node->name; + + return (void *)(unsigned long)res->start; + +@@ -737,6 +737,7 @@ int dma_set_mask(struct device *dev, u64 + } + EXPORT_SYMBOL(dma_set_mask); + ++ + #ifdef CONFIG_PROC_FS + + static int sparc_io_proc_show(struct seq_file *m, void *v) |