diff --git a/[refs] b/[refs] index c8c93d117531..1dac5a748742 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c8e170aaa7ba62c0160e96a52e25ad004419109 +refs/heads/master: 4e10ae11317b238609fc3ec9d50a5dee9473e045 diff --git a/trunk/include/linux/amba/bus.h b/trunk/include/linux/amba/bus.h index ab94335b4bb9..6816be6c3f77 100644 --- a/trunk/include/linux/amba/bus.h +++ b/trunk/include/linux/amba/bus.h @@ -1,5 +1,9 @@ /* - * linux/include/asm-arm/hardware/amba.h + * linux/include/amba/bus.h + * + * This device type deals with ARM PrimeCells and anything else that + * presents a proper CID (0xB105F00D) at the end of the I/O register + * region or that is derived from a PrimeCell. * * Copyright (C) 2003 Deep Blue Solutions Ltd, All Rights Reserved. *