diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-10 18:18:13 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-10 18:18:13 -0800 |
| commit | 0482e3c6f704d25b6a4e3c940caeeacece4e6d74 (patch) | |
| tree | a8506b9b15ed9a31c2171fc7b461ef52453307b0 /arch/arm/plat-omap/omap_device.c | |
| parent | 9ba874506b7b3883d78b8cad61eba39c4bb09885 (diff) | |
| parent | a6c7fdd29350a74ba5f76809436de9c3d6763009 (diff) | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/omap_device.c')
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index d8c75c8f78d..5195dbb1a39 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -89,16 +89,6 @@ #define USE_WAKEUP_LAT 0 #define IGNORE_WAKEUP_LAT 1 -/* XXX this should be moved into a separate file */ -#if defined(CONFIG_ARCH_OMAP2420) -# define OMAP_32KSYNCT_BASE 0x48004000 -#elif defined(CONFIG_ARCH_OMAP2430) -# define OMAP_32KSYNCT_BASE 0x49020000 -#elif defined(CONFIG_ARCH_OMAP3430) -# define OMAP_32KSYNCT_BASE 0x48320000 -#else -# error Unknown OMAP device -#endif /* Private functions */ |