git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
arch
/
microblaze
/
include
/
asm
/
setup.h
diff --git
a/arch/microblaze/include/asm/setup.h
b/arch/microblaze/include/asm/setup.h
index 3657f5e78a3d0e2cb96a8fe2a169dc8126b4c77b..bf2600f75959322287881e3d48e4e088c1cac92a 100644
(file)
--- a/
arch/microblaze/include/asm/setup.h
+++ b/
arch/microblaze/include/asm/setup.h
@@
-25,7
+25,5
@@
void machine_shutdown(void);
void machine_halt(void);
void machine_power_off(void);
-extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
-
# endif /* __ASSEMBLY__ */
#endif /* _ASM_MICROBLAZE_SETUP_H */