[kernel] generic/2.6.29: add missing Kconfig options

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

diff --git a/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch
index 326e6bf..b775a0e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch
@@ -1,13 +1,11 @@
 --- /dev/null
 +++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
+@@ -0,0 +1,605 @@
 +/*
 + * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
 + * This module hooks up the mmc_spi and spi_gpio modules and also
 + * provides a configfs interface.
 + *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
 + * Licensed under the GNU/GPL. See COPYING for details.
 + */
 +
@@ -32,7 +30,6 @@
 +
 +
 +MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
 +MODULE_LICENSE("GPL");
 +
 +
@@ -611,7 +608,7 @@
 +module_exit(gpiommc_modexit);
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
-@@ -130,3 +130,27 @@
+@@ -130,3 +130,27 @@ config MMC_SPI
  
          If unsure, or if your system has no SPI master driver, say N.
  
@@ -641,7 +638,7 @@
 +        if configfs is available.
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile
-@@ -17,4 +17,4 @@
+@@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)               += omap.o
  obj-$(CONFIG_MMC_AT91)                += at91_mci.o
  obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
  obj-$(CONFIG_MMC_SPI)         += mmc_spi.o
@@ -649,12 +646,10 @@
 +obj-$(CONFIG_GPIOMMC)         += gpiommc.o
 --- /dev/null
 +++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,69 @@
 +/*
 + * Device driver for MMC/SD cards driven over a GPIO bus.
 + *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
 + * Licensed under the GNU/GPL version 2.
 + */
 +#ifndef LINUX_GPIOMMC_H_
@@ -821,17 +816,3 @@
 +(/config/gpiommc/my_mmc in this example).
 +There's no need to first unregister the device before removing it. That will
 +be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -1736,6 +1736,11 @@
- W:    http://gigaset307x.sourceforge.net/
- S:    Maintained
- 
-+GPIOMMC DRIVER
-+P:    Michael Buesch
-+M:    mb@bu3sch.de
-+S:    Maintained
-+
- HARDWARE MONITORING
- P:    Mark M. Hoffman
- M:    mhoffman@lightlink.com