Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94d40b69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents 062dfa43 1df2ab48

arch/sparc/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/ 
# Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)

# Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)

INIT_Y		:= $(patsubst %/, %/built-in.o, $(init-y))

INIT_Y		:= $(patsubst %/, %/built-in.o, $(init-y))

CORE_Y		:= $(core-y)

CORE_Y		:= $(core-y)

CORE_Y		+= kernel/ mm/ fs/ ipc/ security/ crypto/

CORE_Y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/

CORE_Y		:= $(patsubst %/, %/built-in.o, $(CORE_Y))

CORE_Y		:= $(patsubst %/, %/built-in.o, $(CORE_Y))

DRIVERS_Y	:= $(patsubst %/, %/built-in.o, $(drivers-y))

DRIVERS_Y	:= $(patsubst %/, %/built-in.o, $(drivers-y))

NET_Y		:= $(patsubst %/, %/built-in.o, $(net-y))

NET_Y		:= $(patsubst %/, %/built-in.o, $(net-y))

arch/sparc/lib/atomic32.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u) 
	return ret != u;

	return ret != u;

}

}





static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)

/* Atomic operations are already serializing */

/* Atomic operations are already serializing */

void atomic_set(atomic_t *v, int i)

void atomic_set(atomic_t *v, int i)

{

{

drivers/video/bw2.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,6 @@ struct bw2_par { 
	unsigned long		fbsize;

	unsigned long		fbsize;





	struct sbus_dev		*sdev;

	struct sbus_dev		*sdev;

	struct list_head	list;

};

};





/**

/**

drivers/video/cg14.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -206,7 +206,6 @@ struct cg14_par { 
	int			mode;

	int			mode;

	int			ramsize;

	int			ramsize;

	struct sbus_dev		*sdev;

	struct sbus_dev		*sdev;

	struct list_head	list;

};

};





static void __cg14_reset(struct cg14_par *par)

static void __cg14_reset(struct cg14_par *par)

drivers/video/cg3.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -124,7 +124,6 @@ struct cg3_par { 
	unsigned long		fbsize;

	unsigned long		fbsize;





	struct sbus_dev		*sdev;

	struct sbus_dev		*sdev;

	struct list_head	list;

};

};





/**

/**