Stephan Linz <linz@xxxxxxxxxx> writes: > - dts: rename 'ide-disk' to 'disk-activity' > - platform: rename 'ide-disk' to 'disk-activity' > - defconfig: rename 'LEDS_TRIGGER_IDE_DISK' to 'LEDS_TRIGGER_DISK' > > Signed-off-by: Stephan Linz <linz@xxxxxxxxxx> > --- > arch/arm/boot/dts/am57xx-beagle-x15.dts | 2 +- > arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +- > arch/arm/boot/dts/kirkwood-topkick.dts | 2 +- > arch/arm/configs/collie_defconfig | 2 +- > arch/arm/configs/ixp4xx_defconfig | 2 +- > arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- > arch/arm/mach-omap1/board-osk.c | 2 +- > arch/arm/mach-pxa/spitz.c | 2 +- > 8 files changed, 8 insertions(+), 8 deletions(-) For mach-pxa: Acked-by: Robert Jarzmik <robert.jarzmik@xxxxxxx> Cheers. -- Robert -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html