summaryrefslogtreecommitdiff
path: root/include/asm-microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-05-08 00:32:35 +0200
committerMichal Simek <monstr@monstr.eu>2007-05-08 00:32:35 +0200
commit3c4bd60de15d79ddfc0cf3170a55847b2025d93f (patch)
tree891b84b58f13a5f45536a243585b9d94c253a410 /include/asm-microblaze
parentfb05f6da35ea1c15c553abe6f23f656bf18dc5db (diff)
parentac4cd59d59c9bf3f89cb7a344abf8184d678f562 (diff)
Merge git://www.denx.de/git/u-boot
Conflicts: include/asm-microblaze/microblaze_intc.h include/linux/stat.h
Diffstat (limited to 'include/asm-microblaze')
-rw-r--r--include/asm-microblaze/microblaze_timer.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-microblaze/microblaze_timer.h b/include/asm-microblaze/microblaze_timer.h
index b3d194bd476..844c8db1151 100644
--- a/include/asm-microblaze/microblaze_timer.h
+++ b/include/asm-microblaze/microblaze_timer.h
@@ -39,4 +39,3 @@ typedef volatile struct microblaze_timer_t {
int loadreg; /* load register TLR */
int counter; /* timer/counter register */
} microblaze_timer_t;
-