]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a5a5b8c) | patch
[ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict
authorTony Lindgren <tony@atomide.com>
Tue, 14 Oct 2008 20:27:27 +0000 (21:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 14 Oct 2008 21:24:14 +0000 (22:24 +0100)
commitaa59e19d05114f9fb7718d6bc8398255476fb4f5
tree6396523489f83b0f9c5856904164c3c67aa17254tree | snapshot
parenta5a5b8c527b8d88056d4a63ccac66eb20af8228bcommit | diff
[ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict

With the upcoming WDT patches OMAP_WDT_BASE is no longer needed
in devices.c. Revert some earlier omap3 changes to avoid merge
conflicts with the WDT patches.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/plat-omap/devices.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.