[GIT PULL v3] pxa: patches for v2.6.38-rc

Eric Miao eric.y.miao at gmail.com
Fri Jan 14 20:26:39 EST 2011


On Fri, Jan 14, 2011 at 3:49 PM, Russell King - ARM Linux
<linux at arm.linux.org.uk> wrote:
> On Fri, Jan 14, 2011 at 05:31:47PM +0000, Russell King - ARM Linux wrote:
>> On Fri, Jan 14, 2011 at 11:08:59AM -0600, Eric Miao wrote:
>> > Hi Russell,
>> >
>> > I rebased the branch on top of devel-stable. The conflict in irq.c is
>> > fixed. And there is a one-liner patch fixing a building issue in spitz.c
>> > missing of physmap.h. Please re-pull and let know any other issue.
>>
>> Pulled cleanly, thanks.
>
> Building my PXA config:
>
> arch/arm/mach-pxa/irq.c:124: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/irq.c:125: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/irq.c:126: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/irq.c:127: warning: initialization from incompatible pointer type
>
> Seems the initializers want to be .irq_ack rather than .ack etc.

You are right. Do you want me to have another patch on top or I
make the change back into the guilty commit and you re-pull? I'd
prefer the latter.

>
> I also need to remove asm/pgtable.h from arch/arm/mach-pxa/generic.c:
>  CC      arch/arm/mach-pxa/generic.o
> In file included from arch/arm/include/asm/pgtable.h:461,
>                 from arch/arm/mach-pxa/generic.c:26:
> include/asm-generic/pgtable.h: In function ■ptep_test_and_clear_young■:
> include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type
>
> and I also got:
> arch/arm/mach-pxa/tosa-bt.c: In function ■tosa_bt_probe■:
> arch/arm/mach-pxa/tosa-bt.c:84: error: implicit declaration of function ■rfkill_set_led_trigger_name■
>
> which looks like a missing dependency.
>
> Do you want to fix these and send an updated pull?
>



More information about the linux-arm-kernel mailing list