Joseph Lo
af7f322ea8
ARM: tegra: remove ifdef in the tegra_resume ...
The ifdef was originally added with the intent that the runtime SoC
detection code, and code to support SoCs other than Tegra20, was only
included if the kernel supported SoCs other than Tegra20. However,
the condition was somewhat backwards and did not achieve this goal.
Simply remove the ifdef to solve this, rather than creating a much more
complex version.
We also fix a typo that caused a build error due to cpu_to_csr_req being
undefined.
Reported-by: Arnd Bergmann <[email protected] >
Signed-off-by: Joseph Lo <[email protected] >
[swarren: rewrote commit description]
Signed-off-by: Stephen Warren <[email protected] >
2013-06-05 11:37:08 -06:00
Removal of GENERIC_GPIO for v3.10
2013-05-09 09:59:16 -07:00
Aliasing VIPT dcache support for ARC
2013-05-10 07:24:14 -07:00
ARM: tegra: remove ifdef in the tegra_resume
2013-06-05 11:37:08 -06:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-05-10 09:21:05 -07:00
Removal of GENERIC_GPIO for v3.10
2013-05-09 09:59:16 -07:00
blackfin updates for Linux 3.10
2013-05-10 07:21:16 -07:00
dump_stack: unify debug information printed by show_regs()
2013-04-30 17:04:02 -07:00
- Lots of cleanups from Artem, including deletion of some obsolete drivers
2013-05-09 10:15:46 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
Removal of GENERIC_GPIO for v3.10
2013-05-09 09:59:16 -07:00
Removal of GENERIC_GPIO for v3.10
2013-05-09 09:59:16 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
- Artem's removal of dead code continues (RPX, MBX860)
2013-05-10 09:09:47 -07:00
Removal of GENERIC_GPIO for v3.10
2013-05-09 09:59:16 -07:00
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
2013-05-10 07:19:52 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-05-10 09:21:05 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
Removal of GENERIC_GPIO for v3.10
2013-05-09 09:59:16 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-05-10 09:21:05 -07:00
Merge git://git.infradead.org/users/eparis/audit
2013-05-11 14:29:11 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-05-10 09:21:05 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
Removal of GENERIC_GPIO for v3.10
2013-05-09 09:59:16 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-05-10 09:21:05 -07:00
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2013-05-09 14:34:58 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-07 15:14:53 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-05-10 09:21:05 -07:00
Bug-fixes:
2013-05-11 16:19:30 -07:00
Xtensa patchset for v3.10-rc1
2013-05-09 14:38:16 -07:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
af7f322ea8