Commit 7e3683e3 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents cd862faa 6aeda98b
......@@ -1837,7 +1837,7 @@ ahc_linux_register_host(struct ahc_softc *ahc, Scsi_Host_Template *template)
}
uint64_t
ahc_linux_get_memsize()
ahc_linux_get_memsize(void)
{
struct sysinfo si;
......@@ -1852,7 +1852,7 @@ ahc_linux_get_memsize()
* scenario.
*/
static int
ahc_linux_next_unit()
ahc_linux_next_unit(void)
{
struct ahc_softc *ahc;
int unit;
......
......@@ -2658,7 +2658,7 @@ sg_allow_access(unsigned char opcode, char dev_type)
#ifdef CONFIG_PROC_FS
static int
sg_last_dev()
sg_last_dev(void)
{
int k;
unsigned long iflags;
......@@ -2770,7 +2770,7 @@ static struct sg_proc_leaf sg_proc_leaf_arr[] = {
extern struct proc_dir_entry *proc_scsi;
static int
sg_proc_init()
sg_proc_init(void)
{
int k, mask;
int num_leaves =
......@@ -2798,7 +2798,7 @@ sg_proc_init()
}
static void
sg_proc_cleanup()
sg_proc_cleanup(void)
{
int k;
int num_leaves =
......
......@@ -52,7 +52,7 @@
DECLARE_MUTEX(rtnl_sem);
void rtnl_lock()
void rtnl_lock(void)
{
rtnl_shlock();
rtnl_exlock();
......
......@@ -314,7 +314,7 @@ struct xfrm_policy *xfrm_policy_byid(int dir, u32 id, int delete)
return pol;
}
void xfrm_policy_flush()
void xfrm_policy_flush(void)
{
struct xfrm_policy *xp;
int dir;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment