lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2005-12-12 15:49:27 -08:00
parent 062dfa433c 1df2ab48f9
commit 94d40b699f
10 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/Makefile
View File

@@ -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))

1
arch/sparc/lib/atomic32.c
View File

@@ -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)
{ {

1
drivers/video/bw2.c
View File

@@ -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;
}; };
/** /**

1
drivers/video/cg14.c
View File

@@ -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)

1
drivers/video/cg3.c
View File

@@ -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;
}; };
/** /**

3
drivers/video/cg6.c
View File

@@ -265,7 +265,6 @@ struct cg6_par {
unsigned long fbsize; unsigned long fbsize;
struct sbus_dev *sdev; struct sbus_dev *sdev;
struct list_head list;
}; };
static int cg6_sync(struct fb_info *info) static int cg6_sync(struct fb_info *info)
@@ -612,7 +611,7 @@ static void cg6_chip_init(struct fb_info *info)
struct cg6_par *par = (struct cg6_par *) info->par; struct cg6_par *par = (struct cg6_par *) info->par;
struct cg6_tec __iomem *tec = par->tec; struct cg6_tec __iomem *tec = par->tec;
struct cg6_fbc __iomem *fbc = par->fbc; struct cg6_fbc __iomem *fbc = par->fbc;
u32 rev, conf, mode, tmp; u32 rev, conf, mode;
int i; int i;
/* Turn off stuff in the Transform Engine. */ /* Turn off stuff in the Transform Engine. */

1
drivers/video/ffb.c
View File

@@ -359,7 +359,6 @@ struct ffb_par {
int prom_parent_node; int prom_parent_node;
int dac_rev; int dac_rev;
int board_type; int board_type;
struct list_head list;
}; };
static void FFBFifo(struct ffb_par *par, int n) static void FFBFifo(struct ffb_par *par, int n)

1
drivers/video/leo.c
View File

@@ -197,7 +197,6 @@ struct leo_par {
unsigned long fbsize; unsigned long fbsize;
struct sbus_dev *sdev; struct sbus_dev *sdev;
struct list_head list;
}; };
static void leo_wait(struct leo_lx_krn __iomem *lx_krn) static void leo_wait(struct leo_lx_krn __iomem *lx_krn)

1
drivers/video/p9100.c
View File

@@ -140,7 +140,6 @@ struct p9100_par {
unsigned long fbsize; unsigned long fbsize;
struct sbus_dev *sdev; struct sbus_dev *sdev;
struct list_head list;
}; };
/** /**

3
drivers/video/tcx.c
View File

@@ -125,7 +125,6 @@ struct tcx_par {
int lowdepth; int lowdepth;
struct sbus_dev *sdev; struct sbus_dev *sdev;
struct list_head list;
}; };
/* Reset control plane so that WID is 8-bit plane. */ /* Reset control plane so that WID is 8-bit plane. */
@@ -444,7 +443,7 @@ static void tcx_init_one(struct sbus_dev *sdev)
tcx_reset(&all->info); tcx_reset(&all->info);
tcx_blank(0, &all->info); tcx_blank(FB_BLANK_UNBLANK, &all->info);
if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
printk(KERN_ERR "tcx: Could not allocate color map.\n"); printk(KERN_ERR "tcx: Could not allocate color map.\n");