Re: [PATCH 1/2] OLPC: Only enable PCI configuration type overrideon XO-1

[H. Peter Anvin]

On 09/24/2010 11:03 AM, Jesse Barnes wrote:
> On Thu, 23 Sep 2010 17:28:04 +0100 (BST)
> Daniel Drake <dsd@xxxxxxxxxx> wrote:
> 
>> This configuration type override is for XO-1 only and must not happen
>> on XO-1.5.
>>
>> Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
>> ---
>>
>> Replaces earlier patches:
>> [PATCH 1/3] OLPC: extended board revision detection
>> [PATCH 2/3] PCI: OLPC configuration cleanup
>>
>> Due to the fact that CONFIG_OLPC is associated with multiple laptop models
>> (not only the XO-1), it makes sense to keep this as a separate configuration
>> option.
>>
>> We decided against adding functions to distinguish between XO-1/XO-1.5 as
>> we don't want to encourage laptop checking in this way. There should only be
>> one or two cases where this actually matters (here is one of them).
> 
> Applied to linux-next, thanks.
> 

I already put these two patches into -tip, which should get it into
linux-next...

	-hpa

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/