projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
freescale
/
fman
/
fman_muram.h
diff --git
a/drivers/net/ethernet/freescale/fman/fman_muram.h
b/drivers/net/ethernet/freescale/fman/fman_muram.h
index
889649a
..
453bf84
100644
(file)
--- a/
drivers/net/ethernet/freescale/fman/fman_muram.h
+++ b/
drivers/net/ethernet/freescale/fman/fman_muram.h
@@
-46,6
+46,7
@@
unsigned long fman_muram_offset_to_vbase(struct muram_info *muram,
unsigned long fman_muram_alloc(struct muram_info *muram, size_t size);
unsigned long fman_muram_alloc(struct muram_info *muram, size_t size);
-void fman_muram_free_mem(struct muram_info *muram, unsigned long offset, size_t size);
+void fman_muram_free_mem(struct muram_info *muram, unsigned long offset,
+ size_t size);
#endif /* __FM_MURAM_EXT */
#endif /* __FM_MURAM_EXT */