Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7d10ae3..b55746c 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -64,6 +64,8 @@
source "drivers/tty/serial/Kconfig"
+source "drivers/char/diag/Kconfig"
+
config TTY_PRINTK
bool "TTY driver to output user messages via printk"
depends on EXPERT
@@ -633,5 +635,46 @@
Enables userspace clients to read and write to some packet SMD
ports via device interface for MSM chipset.
+config MSM_ROTATOR
+ tristate "MSM Offline Image Rotator Driver"
+ depends on (ARCH_MSM7X30 || ARCH_MSM8X60 || ARCH_MSM8960) && ANDROID_PMEM
+ default y
+ help
+ This driver provides support for the image rotator HW block in the
+ MSM 7x30 SoC.
+
+config MSM_ROTATOR_USE_IMEM
+ bool "Enable rotator driver to use iMem"
+ depends on ARCH_MSM7X30 && MSM_ROTATOR
+ default y
+ help
+ This option enables the msm_rotator driver to use the move efficient
+ iMem. Some MSM platforms may not have iMem available for the rotator
+ block. Or some systems may want the iMem to be dedicated to a
+ different function.
+
+config MMC_GENERIC_CSDIO
+ tristate "Generic sdio driver"
+ default n
+ help
+ SDIO function driver that extends SDIO card as character device
+ in user space.
+
+config CSDIO_VENDOR_ID
+ hex "Card VendorId"
+ depends on MMC_GENERIC_CSDIO
+ default "0"
+ help
+ Enter vendor id for targeted sdio device, this may be overwritten by
+ module parameters.
+
+config CSDIO_DEVICE_ID
+ hex "CardDeviceId"
+ depends on MMC_GENERIC_CSDIO
+ default "0"
+ help
+ Enter device id for targeted sdio device, this may be overwritten by
+ module parameters.
+.
endmenu