projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad06ff1
)
linux/generic: refresh 2.6.36 patches
author
Alexandros C. Couloumbis
<alex@ozo.com>
Thu, 21 Oct 2010 08:23:11 +0000
(08:23 +0000)
committer
Alexandros C. Couloumbis
<alex@ozo.com>
Thu, 21 Oct 2010 08:23:11 +0000
(08:23 +0000)
SVN-Revision: 23560
target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.36/021-mips_image_cmdline_hack.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.36/025-mips_disable_fpu.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.36/750-glamo-headers.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.36/921-gpio_spi_driver.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.36/922-gpiommc.patch
patch
|
blob
|
history
diff --git
a/target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
b/target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
index be9b7c321190f605f882a4ac5efc19073b8115cf..a77913d281759e8927fb14cd68934caf0f60aa2f 100644
(file)
--- a/
target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
+++ b/
target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
@@
-156,7
+156,7
@@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -87
4,6 +874
,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
+@@ -87
5,6 +875
,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
config SYNC_R4K
bool
config SYNC_R4K
bool
diff --git
a/target/linux/generic/patches-2.6.36/021-mips_image_cmdline_hack.patch
b/target/linux/generic/patches-2.6.36/021-mips_image_cmdline_hack.patch
index 74b7117884536811298045753b48dee1c8c89c0e..af421172023902bc643a06d2bc544fbd06976cca 100644
(file)
--- a/
target/linux/generic/patches-2.6.36/021-mips_image_cmdline_hack.patch
+++ b/
target/linux/generic/patches-2.6.36/021-mips_image_cmdline_hack.patch
@@
-1,6
+1,6
@@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -87
7,6 +877
,10 @@ config SYNC_R4K
+@@ -87
8,6 +878
,10 @@ config SYNC_R4K
config MIPS_MACHINE
def_bool n
config MIPS_MACHINE
def_bool n
diff --git
a/target/linux/generic/patches-2.6.36/025-mips_disable_fpu.patch
b/target/linux/generic/patches-2.6.36/025-mips_disable_fpu.patch
index 8e37f6ccec597efba5bfcef3a1e6d93573fb28a1..b345503d2f9e5de5aa04f984ba73a52b58271630 100644
(file)
--- a/
target/linux/generic/patches-2.6.36/025-mips_disable_fpu.patch
+++ b/
target/linux/generic/patches-2.6.36/025-mips_disable_fpu.patch
@@
-8,7
+8,7
@@
Signed-off-by: Florian Fainelli <florian@openwrt.org>
--
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -86
2,6 +862
,17 @@ config I8259
+@@ -86
3,6 +863
,17 @@ config I8259
config MIPS_BONITO64
bool
config MIPS_BONITO64
bool
diff --git
a/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
b/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
index 282ef68814a83fe4576babdd064aba7a72f087dd..c5e14d7aaa3fb8b8b11369d092fdb312e9cf7c4d 100644
(file)
--- a/
target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
+++ b/
target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
@@
-23,7
+23,7
@@
/* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device.
/* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device.
-@@ -19
23,7 +192
4,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -19
43,7 +194
4,9 @@ static void __devinit fixup_rev1_53c810(
}
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
}
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@@
-33,7
+33,7
@@
/* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{
/* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{
-@@ -2
596,6 +259
9,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2
616,6 +261
9,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
#endif /* CONFIG_PCI_IOV */
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
#endif /* CONFIG_PCI_IOV */
diff --git
a/target/linux/generic/patches-2.6.36/750-glamo-headers.patch
b/target/linux/generic/patches-2.6.36/750-glamo-headers.patch
index c0195f76591dfaefab5a9bfa83bda4fa21f66009..d592204f3c474801c34df451bf8bb61c8e8a0a3d 100644
(file)
--- a/
target/linux/generic/patches-2.6.36/750-glamo-headers.patch
+++ b/
target/linux/generic/patches-2.6.36/750-glamo-headers.patch
@@
-10,7
+10,7
@@
#define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
#define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
-@@ -13
8,6 +138
,8 @@ header-y += generic_serial.h
+@@ -13
7,6 +137
,8 @@ header-y += generic_serial.h
header-y += genetlink.h
header-y += gfs2_ondisk.h
header-y += gigaset_dev.h
header-y += genetlink.h
header-y += gfs2_ondisk.h
header-y += gigaset_dev.h
diff --git
a/target/linux/generic/patches-2.6.36/921-gpio_spi_driver.patch
b/target/linux/generic/patches-2.6.36/921-gpio_spi_driver.patch
index 9c80f9025b98d27c26a77ec46edae8adf452879b..4de5a2ac5cc013f354980e3a8aefab2c85e3f3d3 100644
(file)
--- a/
target/linux/generic/patches-2.6.36/921-gpio_spi_driver.patch
+++ b/
target/linux/generic/patches-2.6.36/921-gpio_spi_driver.patch
@@
-14,7
+14,7
@@
Please use the new mainline SPI-GPIO driver, as of 2.6.29.
4 files changed, 334 insertions(+)
--- /dev/null
4 files changed, 334 insertions(+)
--- /dev/null
-+++
linux-2.6.36-rc7
/include/linux/spi/spi_gpio_old.h
++++
b
/include/linux/spi/spi_gpio_old.h
@@ -0,0 +1,73 @@
+/*
+ * spi_gpio interface to platform code
@@ -0,0 +1,73 @@
+/*
+ * spi_gpio interface to platform code
@@
-90,7
+90,7
@@
Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+
+#endif /* _LINUX_SPI_SPI_GPIO */
--- /dev/null
+
+#endif /* _LINUX_SPI_SPI_GPIO */
--- /dev/null
-+++
linux-2.6.36-rc7
/drivers/spi/spi_gpio_old.c
++++
b
/drivers/spi/spi_gpio_old.c
@@ -0,0 +1,251 @@
+/*
+ * Bitbanging SPI bus driver using GPIO API
@@ -0,0 +1,251 @@
+/*
+ * Bitbanging SPI bus driver using GPIO API
@@
-343,8
+343,8
@@
Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+MODULE_AUTHOR("Michael Buesch");
+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Michael Buesch");
+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
+MODULE_LICENSE("GPL v2");
----
linux-2.6.36-rc7.orig
/drivers/spi/Kconfig
-+++
linux-2.6.36-rc7
/drivers/spi/Kconfig
+---
a
/drivers/spi/Kconfig
++++
b
/drivers/spi/Kconfig
@@ -143,6 +143,15 @@ config SPI_GPIO
GPIO operations, you should be able to leverage that for better
speed with a custom version of this driver; see the source code.
@@ -143,6 +143,15 @@ config SPI_GPIO
GPIO operations, you should be able to leverage that for better
speed with a custom version of this driver; see the source code.
@@
-361,8
+361,8
@@
Please use the new mainline SPI-GPIO driver, as of 2.6.29.
config SPI_IMX
tristate "Freescale i.MX SPI controllers"
depends on ARCH_MXC
config SPI_IMX
tristate "Freescale i.MX SPI controllers"
depends on ARCH_MXC
----
linux-2.6.36-rc7.orig
/drivers/spi/Makefile
-+++
linux-2.6.36-rc7
/drivers/spi/Makefile
+---
a
/drivers/spi/Makefile
++++
b
/drivers/spi/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_SPI_DW_PCI) += dw_spi_pci.
obj-$(CONFIG_SPI_DW_MMIO) += dw_spi_mmio.o
obj-$(CONFIG_SPI_EP93XX) += ep93xx_spi.o
@@ -23,6 +23,7 @@ obj-$(CONFIG_SPI_DW_PCI) += dw_spi_pci.
obj-$(CONFIG_SPI_DW_MMIO) += dw_spi_mmio.o
obj-$(CONFIG_SPI_EP93XX) += ep93xx_spi.o
diff --git
a/target/linux/generic/patches-2.6.36/922-gpiommc.patch
b/target/linux/generic/patches-2.6.36/922-gpiommc.patch
index 887bb3ca458c933d6b8332c48ec06bc8efbf776a..214ad6618c371f32a456c17c266f17fd0d750789 100644
(file)
--- a/
target/linux/generic/patches-2.6.36/922-gpiommc.patch
+++ b/
target/linux/generic/patches-2.6.36/922-gpiommc.patch
@@
-829,7
+829,7
@@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -26
62,6 +2662
,11 @@ T: git git://git.kernel.org/pub/scm/linu
+@@ -26
79,6 +2679
,11 @@ T: git git://git.kernel.org/pub/scm/linu
S: Maintained
F: drivers/media/video/gspca/
S: Maintained
F: drivers/media/video/gspca/