[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100922101047.86a6cfcb.rdunlap@xenotime.net>
Date: Wed, 22 Sep 2010 10:10:47 -0700
From: Randy Dunlap <rdunlap@...otime.net>
To: Daniel Drake <dsd@...top.org>
Cc: tglx@...utronix.de, jbarnes@...tuousgeek.org,
linux-pci@...r.kernel.org, x86@...nel.org,
linux-kernel@...r.kernel.org, dilinger@...ued.net
Subject: Re: [PATCH 2/3] PCI: OLPC configuration cleanup
On Wed, 22 Sep 2010 17:44:02 +0100 (BST) Daniel Drake wrote:
> An OLPC system isn't usable without PCI, so we can simplify the
> configuration here.
preferably by using "depends on" instead of "select".
> Also updated the code to be clearer that this is only for XO-1, and
> fixed an issue where the XO-1 PCI configuration override was being
> applied for XO-1.5 laptops.
>
> Based on earlier work by Deepak Saxena.
>
> Signed-off-by: Daniel Drake <dsd@...top.org>
> ---
> arch/x86/Kconfig | 12 +++---------
> arch/x86/kernel/olpc.c | 4 +---
> arch/x86/pci/Makefile | 2 +-
> arch/x86/pci/olpc.c | 4 ++--
> 4 files changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index cea0cd9..708ee0d 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -1899,10 +1899,6 @@ config PCI_GOMMCONFIG
> config PCI_GODIRECT
> bool "Direct"
>
> -config PCI_GOOLPC
> - bool "OLPC"
> - depends on OLPC
> -
> config PCI_GOANY
> bool "Any"
>
> @@ -1915,16 +1911,12 @@ config PCI_BIOS
> # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
> config PCI_DIRECT
> def_bool y
> - depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC))
> + depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY))
>
> config PCI_MMCONFIG
> def_bool y
> depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)
>
> -config PCI_OLPC
> - def_bool y
> - depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
> -
> config PCI_DOMAINS
> def_bool y
> depends on PCI
> @@ -2060,6 +2052,8 @@ config SCx200HR_TIMER
>
> config OLPC
> bool "One Laptop Per Child support"
> + select PCI
> + select PCI_GOANY
> select GPIOLIB
> ---help---
> Add support for detecting the unique features of the OLPC
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists