diff options
author | Tony Lindgren <tony@atomide.com> | 2008-10-14 21:27:27 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 22:24:14 +0100 |
commit | aa59e19d05114f9fb7718d6bc8398255476fb4f5 (patch) | |
tree | 6396523489f83b0f9c5856904164c3c67aa17254 /arch/arm/mach-pxa/eseries_udc.c | |
parent | a5a5b8c527b8d88056d4a63ccac66eb20af8228b (diff) | |
download | blackbird-op-linux-aa59e19d05114f9fb7718d6bc8398255476fb4f5.tar.gz blackbird-op-linux-aa59e19d05114f9fb7718d6bc8398255476fb4f5.zip |
[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>
Diffstat (limited to 'arch/arm/mach-pxa/eseries_udc.c')
0 files changed, 0 insertions, 0 deletions