diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 07:36:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 07:36:36 -0700 |
commit | b463036ad7c6e9a74275f4f901acb3dbb74ec1ad (patch) | |
tree | bfb3f6bb5c93f32728e5cfd052041f0619055f71 /arch/cris/include/arch-v32/mach-fs/mach/startup.inc | |
parent | a06cb1ae3cb64367c0fdc313c43ebb0558e51827 (diff) | |
parent | d75d806cbbfb9c775e87779cd281c9c408c7aba3 (diff) | |
download | lwn-b463036ad7c6e9a74275f4f901acb3dbb74ec1ad.tar.gz lwn-b463036ad7c6e9a74275f4f901acb3dbb74ec1ad.zip |
Merge tag 'cris-for-linus-3.7' of git://jni.nu/cris
Pull CRIS changes from Jesper Nilsson:
"Removal of some unused code from the CRIS port"
* tag 'cris-for-linus-3.7' of git://jni.nu/cris:
CRIS: Remove VCS simulator specific code
cris/PCI: remove pcibios_assign_resources()
Diffstat (limited to 'arch/cris/include/arch-v32/mach-fs/mach/startup.inc')
-rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/startup.inc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/cris/include/arch-v32/mach-fs/mach/startup.inc b/arch/cris/include/arch-v32/mach-fs/mach/startup.inc index dd1abbdcbc7a..96c3b0fb62c1 100644 --- a/arch/cris/include/arch-v32/mach-fs/mach/startup.inc +++ b/arch/cris/include/arch-v32/mach-fs/mach/startup.inc @@ -71,12 +71,6 @@ move.d REG_ADDR(bif_core, regi_bif_core, rw_grp4_cfg), $r0 move.d CONFIG_ETRAX_MEM_GRP4_CONFIG, $r1 move.d $r1, [$r0] -#ifdef CONFIG_ETRAX_VCS_SIM - ;; Set up minimal flash waitstates - move.d 0, $r10 - move.d REG_ADDR(bif_core, regi_bif_core, rw_grp1_cfg), $r11 - move.d $r10, [$r11] -#endif .endm #endif |