From 4f897653dab2580cb3b7ee2a7cc22b4145ebbe68 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Fri, 15 Jan 2010 19:34:25 +0000 Subject: [PATCH] Differentiate between HAVE_USB_CHARGING_ENABLE and HAVE_USB_POWER for the manual. This is what r24005 probably should have been git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24238 a1c6a512-1295-4272-9138-f99709370657 --- apps/features.txt | 5 ++++- manual/appendix/config_file_options.tex | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/features.txt b/apps/features.txt index 0bcfb23507..ad231362de 100644 --- a/apps/features.txt +++ b/apps/features.txt @@ -197,9 +197,12 @@ tc_ramcache #if CONFIG_CHARGING charging -#if defined(HAVE_USB_CHARGING_ENABLE) +#if defined(HAVE_USB_POWER) usb_charging #endif +#if defined(HAVE_USB_CHARGING_ENABLE) +usb_charging_enable +#endif #endif #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index ce95a54a0d..7be265dd56 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex @@ -134,7 +134,7 @@ & on, off & N/A\\ folder navigation & off, on, random & N/A\\ gather runtime data & off, on & N/A\\ - \opt{usb_charging}{ + \opt{usb_charging_enable}{ usb charging & on, off & N/A\\ } skip length & outro, track, 1s, 2s, 3s, 5s, 7s, 10s, 15s, 20s, 1min,