Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/include/mach/hardware.h arch/arm/mach-pxa/spitz.c |
||
|---|---|---|
| .. | ||
| arch.h | ||
| dma.h | ||
| flash.h | ||
| irda.h | ||
| irq.h | ||
| map.h | ||
| mmc.h | ||
| pci.h | ||
| serial_at91.h | ||
| serial_sa1100.h | ||
| sharpsl_param.h | ||
| time.h | ||
| udc_pxa2xx.h | ||