Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
This commit is contained in:
commit
94d40b699f
|
@ -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-)
|
||||
INIT_Y := $(patsubst %/, %/built-in.o, $(init-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))
|
||||
DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y))
|
||||
NET_Y := $(patsubst %/, %/built-in.o, $(net-y))
|
||||
|
|
|
@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u)
|
|||
return ret != u;
|
||||
}
|
||||
|
||||
static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
|
||||
/* Atomic operations are already serializing */
|
||||
void atomic_set(atomic_t *v, int i)
|
||||
{
|
||||
|
|
|
@ -121,7 +121,6 @@ struct bw2_par {
|
|||
unsigned long fbsize;
|
||||
|
||||
struct sbus_dev *sdev;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -206,7 +206,6 @@ struct cg14_par {
|
|||
int mode;
|
||||
int ramsize;
|
||||
struct sbus_dev *sdev;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
static void __cg14_reset(struct cg14_par *par)
|
||||
|
|
|
@ -124,7 +124,6 @@ struct cg3_par {
|
|||
unsigned long fbsize;
|
||||
|
||||
struct sbus_dev *sdev;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -265,7 +265,6 @@ struct cg6_par {
|
|||
unsigned long fbsize;
|
||||
|
||||
struct sbus_dev *sdev;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
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_tec __iomem *tec = par->tec;
|
||||
struct cg6_fbc __iomem *fbc = par->fbc;
|
||||
u32 rev, conf, mode, tmp;
|
||||
u32 rev, conf, mode;
|
||||
int i;
|
||||
|
||||
/* Turn off stuff in the Transform Engine. */
|
||||
|
|
|
@ -359,7 +359,6 @@ struct ffb_par {
|
|||
int prom_parent_node;
|
||||
int dac_rev;
|
||||
int board_type;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
static void FFBFifo(struct ffb_par *par, int n)
|
||||
|
|
|
@ -197,7 +197,6 @@ struct leo_par {
|
|||
unsigned long fbsize;
|
||||
|
||||
struct sbus_dev *sdev;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
static void leo_wait(struct leo_lx_krn __iomem *lx_krn)
|
||||
|
|
|
@ -140,7 +140,6 @@ struct p9100_par {
|
|||
unsigned long fbsize;
|
||||
|
||||
struct sbus_dev *sdev;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -125,7 +125,6 @@ struct tcx_par {
|
|||
int lowdepth;
|
||||
|
||||
struct sbus_dev *sdev;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
/* 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_blank(0, &all->info);
|
||||
tcx_blank(FB_BLANK_UNBLANK, &all->info);
|
||||
|
||||
if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
|
||||
printk(KERN_ERR "tcx: Could not allocate color map.\n");
|
||||
|
|
Loading…
Reference in a new issue