diff --git a/[refs] b/[refs] index bc5aa38fc2e1..5581ba4a0342 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60906a8a4e07eb179a2ed90dda23fa36972c6336 +refs/heads/master: b91585560b59fd3ef4e20ca6f7d35aefda193774 diff --git a/trunk/arch/arm/mach-omap/clock.c b/trunk/arch/arm/plat-omap/clock.c similarity index 99% rename from trunk/arch/arm/mach-omap/clock.c rename to trunk/arch/arm/plat-omap/clock.c index e91186b5341a..155157f309e0 100644 --- a/trunk/arch/arm/mach-omap/clock.c +++ b/trunk/arch/arm/plat-omap/clock.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap/clock.c + * linux/arch/arm/plat-omap/clock.c * * Copyright (C) 2004 Nokia corporation * Written by Tuukka Tikkanen diff --git a/trunk/arch/arm/mach-omap/clock.h b/trunk/arch/arm/plat-omap/clock.h similarity index 98% rename from trunk/arch/arm/mach-omap/clock.h rename to trunk/arch/arm/plat-omap/clock.h index 08c0ddde1835..08b504deb1a1 100644 --- a/trunk/arch/arm/mach-omap/clock.h +++ b/trunk/arch/arm/plat-omap/clock.h @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap/clock.h + * linux/arch/arm/plat-omap/clock.h * * Copyright (C) 2004 Nokia corporation * Written by Tuukka Tikkanen