Revert most of r18029 as recording through line-in is possible on the H10, just not currently functional. Leave the /nopt for line-in on the Sansas.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18030 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 3 insertions, 3 deletions

diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h
index 9b6307267d..071fb0f650 100644
--- a/firmware/export/config-h10.h
+++ b/firmware/export/config-h10.h
@@ -15,7 +15,7 @@
 #define HAVE_RECORDING
 /* Define bitmask of input sources - recordable bitmask can be defined
    explicitly if different */
-#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO)
+#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO)
 
 /* define the bitmask of hardware sample rates */
 #define HW_SAMPR_CAPS   (SAMPR_CAP_44)
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h
index 9ef59ec38d..e7c77e4f4d 100644
--- a/firmware/export/config-h10_5gb.h
+++ b/firmware/export/config-h10_5gb.h
@@ -15,7 +15,7 @@
 #define HAVE_RECORDING
 /* Define bitmask of input sources - recordable bitmask can be defined
    explicitly if different */
-#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO)
+#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO)
 
 /* define the bitmask of hardware sample rates */
 #define HW_SAMPR_CAPS   (SAMPR_CAP_44)
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index dcaad4760c..4607f0fa8a 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -73,7 +73,7 @@
   Choose the source of the recording. The options are: 
   \opt{recorder,recorderv2fm,h1xx}{\setting{SPDIF (digital)}, }%
   \nopt{ipodnano,ipodvideo}{\setting{Mic}, }%
-  \nopt{sansa,IRIVER_H10_PAD}{{\setting{Line In}}}. %
+  \nopt{sansa}{{\setting{Line In}}}. %
   \opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
 
 \section{Channels}