lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'omap-fixes-for-linus' into omap-for-linus

Browse Source
This commit is contained in:
Tony Lindgren
2010-02-10 18:18:13 -08:00
parent 9ba874506b a6c7fdd293
commit 0482e3c6f7
495 changed files with 9406 additions and 5383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/plat-omap/omap_device.c
View File

@@ -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 */