[package] openssl: update to v0.9.8n, thanks Peter Wagner

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.34 / 922-gpiommc.patch

diff --git a/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch
index cb39a70..24e5d59 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch
@@ -611,7 +611,7 @@
 +module_exit(gpiommc_modexit);
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
 +module_exit(gpiommc_modexit);
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig

-@@ -373,6 +373,31 @@ config MMC_TMIO
+@@ -370,6 +370,31 @@ config MMC_TMIO

          This provides support for the SD/MMC cell found in TC6393XB,
          T7L66XB and also HTC ASIC3
  
          This provides support for the SD/MMC cell found in TC6393XB,
          T7L66XB and also HTC ASIC3
  


@@ -645,7 +645,7 @@
        depends on PCI
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile
        depends on PCI
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile

-@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_
+@@ -33,6 +33,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_

  obj-$(CONFIG_MMC_TMIO)                += tmio_mmc.o
  obj-$(CONFIG_MMC_CB710)       += cb710-mmc.o
  obj-$(CONFIG_MMC_VIA_SDMMC)   += via-sdmmc.o
  obj-$(CONFIG_MMC_TMIO)                += tmio_mmc.o
  obj-$(CONFIG_MMC_CB710)       += cb710-mmc.o
  obj-$(CONFIG_MMC_VIA_SDMMC)   += via-sdmmc.o


@@ -829,7 +829,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -2443,6 +2443,11 @@ T:      git git://git.kernel.org/pub/scm/linu
+@@ -2540,6 +2540,11 @@ T:      git git://git.kernel.org/pub/scm/linu

  S:    Maintained
  F:    drivers/media/video/gspca/
  
  S:    Maintained
  F:    drivers/media/video/gspca/