From mboxrd@z Thu Jan  1 00:00:00 1970
From: gnurou@gmail.com (Alexandre Courbot)
Date: Mon, 8 Apr 2013 10:03:30 -0700
Subject: [PATCH] gpio: update gpio Chinese documentation
In-Reply-To: <20130408012253.GA2545@cbz-workstation>
References: <20130408012253.GA2545@cbz-workstation>
Message-ID: <CAAVeFuLrgTGoSU+OG2RWEVorcCSREG10hTMSAafNMZdFdG7APw@mail.gmail.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

2013/4/7 Chen Baozi <baozich@gmail.com>:
> Since the GENERIC_GPIO has been removed and the documentation of it
> has been modified, this patch updates the corresponding documentation of
> gpio in Chinese.
>
> Signed-off-by: Chen Baozi <baozich@gmail.com>
> ---
>  Documentation/zh_CN/gpio.txt | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Acked-by: Alexandre Courbot <acourbot@nvidia.com>

Integrated into my series, thanks. With this I guess I can send the
whole series again to Grant for him to integrate in his branch. It's
time if we want it to make it for 3.10.

Alex.


>
> diff --git a/Documentation/zh_CN/gpio.txt b/Documentation/zh_CN/gpio.txt
> index 4fa7b4e..d5b8f01 100644
> --- a/Documentation/zh_CN/gpio.txt
> +++ b/Documentation/zh_CN/gpio.txt
> @@ -84,10 +84,10 @@ GPIO ??
>  ?????????????(??????????????????,???
>  ????????? GPIO ????????????????????)
>
> -????,?????????????????????????????
> -??? Kconfig ???? GENERIC_GPIO??? (??? true)????
> -?? <asm/gpio.h> ????????? GPIO ???????? Kconfig
> -???????GENERIC_GPIO????????:
> +????,????????????????????????????????
> +??? Kconfig ??? ARCH_REQUIRE_GPIOLIB ?? ARCH_WANT_OPTIONAL_GPIOLIB
> +????????? GPIO ???????? Kconfig ???????GENERIC_GPIO?
> +???????:
>
>         #include <linux/gpio.h>
>
> --
> 1.8.1.4
>