diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-18 21:23:49 +0100 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-18 21:23:49 +0100 |
commit | 29f344abe8d0564b0bbda49d5fc468666a507a07 (patch) | |
tree | 3415c4763ac5ce0245c5de636d7fad8cec1ff3e2 /recipes/linux/linux-2.6.31/ben-nanonote/053-adc.patch | |
parent | 74d2b0a5de1a16d3e86e6b2073039de056f537ef (diff) | |
parent | b33cef056cc338b6be590d34321061a4b508063e (diff) |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux/linux-2.6.31/ben-nanonote/053-adc.patch')
-rw-r--r-- | recipes/linux/linux-2.6.31/ben-nanonote/053-adc.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/recipes/linux/linux-2.6.31/ben-nanonote/053-adc.patch b/recipes/linux/linux-2.6.31/ben-nanonote/053-adc.patch deleted file mode 100644 index 2f71ddceb5..0000000000 --- a/recipes/linux/linux-2.6.31/ben-nanonote/053-adc.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/drivers/misc/Kconfig -+++ b/drivers/misc/Kconfig -@@ -233,6 +233,17 @@ config ISL29003 - This driver can also be built as a module. If so, the module - will be called isl29003. - -+config JZ4740_ADC -+ tristate "Ingenic JZ4720/JZ4740 SoC ADC driver" -+ depends on SOC_JZ4740 -+ help -+ If you say yes here you get support for the Ingenic JZ4720/JZ4740 SoC ADC -+ core. It is required for the JZ4720/JZ4740 battery and touchscreen driver -+ and is used to synchronize access to the adc core between those two. -+ -+ This driver can also be build as a module. If so, the module will be -+ called jz4740-adc. -+ - source "drivers/misc/c2port/Kconfig" - source "drivers/misc/eeprom/Kconfig" - source "drivers/misc/cb710/Kconfig" ---- a/drivers/misc/Makefile -+++ b/drivers/misc/Makefile -@@ -20,5 +20,6 @@ obj-$(CONFIG_SGI_GRU) += sgi-gru/ - obj-$(CONFIG_HP_ILO) += hpilo.o - obj-$(CONFIG_ISL29003) += isl29003.o - obj-$(CONFIG_C2PORT) += c2port/ -+obj-$(CONFIG_JZ4740_ADC) += jz4740-adc.o - obj-y += eeprom/ - obj-y += cb710/ |