From 1906ce278e62908ed658b076adc8d2bf1f514919 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Thu, 28 Jan 2010 16:11:51 +0800 Subject: [PATCH] --- yaml --- r: 187760 b: refs/heads/master c: 551e378ca1852dc51609b722014416d4da0770c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/fbio.h | 2 +- trunk/arch/sparc/include/asm/fbio.h | 2 +- trunk/drivers/net/skfp/ess.c | 2 +- trunk/drivers/video/68328fb.c | 2 +- trunk/drivers/video/pm2fb.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fbe156254f71..bed4009beb4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9a5f04b6a8e0e681ae37fde84016a57ca17371f +refs/heads/master: 551e378ca1852dc51609b722014416d4da0770c6 diff --git a/trunk/arch/m68k/include/asm/fbio.h b/trunk/arch/m68k/include/asm/fbio.h index b9215a0907d3..0a21da87f7d6 100644 --- a/trunk/arch/m68k/include/asm/fbio.h +++ b/trunk/arch/m68k/include/asm/fbio.h @@ -173,7 +173,7 @@ struct mdi_cfginfo { int mdi_ncluts; /* Number of implemented CLUTs in this MDI */ int mdi_type; /* FBTYPE name */ int mdi_height; /* height */ - int mdi_width; /* widht */ + int mdi_width; /* width */ int mdi_size; /* available ram */ int mdi_mode; /* 8bpp, 16bpp or 32bpp */ int mdi_pixfreq; /* pixel clock (from PROM) */ diff --git a/trunk/arch/sparc/include/asm/fbio.h b/trunk/arch/sparc/include/asm/fbio.h index b9215a0907d3..0a21da87f7d6 100644 --- a/trunk/arch/sparc/include/asm/fbio.h +++ b/trunk/arch/sparc/include/asm/fbio.h @@ -173,7 +173,7 @@ struct mdi_cfginfo { int mdi_ncluts; /* Number of implemented CLUTs in this MDI */ int mdi_type; /* FBTYPE name */ int mdi_height; /* height */ - int mdi_width; /* widht */ + int mdi_width; /* width */ int mdi_size; /* available ram */ int mdi_mode; /* 8bpp, 16bpp or 32bpp */ int mdi_pixfreq; /* pixel clock (from PROM) */ diff --git a/trunk/drivers/net/skfp/ess.c b/trunk/drivers/net/skfp/ess.c index a85efcfd9d0e..e8387d25f24a 100644 --- a/trunk/drivers/net/skfp/ess.c +++ b/trunk/drivers/net/skfp/ess.c @@ -557,7 +557,7 @@ static void ess_send_alc_req(struct s_smc *smc) /* * send never allocation request where the requested payload and - * overhead is zero or deallocate bandwidht when no bandwidth is + * overhead is zero or deallocate bandwidth when no bandwidth is * parsed */ if (!smc->mib.fddiESSPayload) { diff --git a/trunk/drivers/video/68328fb.c b/trunk/drivers/video/68328fb.c index 0b17824b0eb5..2110556f76b3 100644 --- a/trunk/drivers/video/68328fb.c +++ b/trunk/drivers/video/68328fb.c @@ -308,7 +308,7 @@ static int mc68x328fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, * Pseudocolor: * uses offset = 0 && length = RAMDAC register width. * var->{color}.offset is 0 - * var->{color}.length contains widht of DAC + * var->{color}.length contains width of DAC * cmap is not used * RAMDAC[X] is programmed to (red, green, blue) * Truecolor: diff --git a/trunk/drivers/video/pm2fb.c b/trunk/drivers/video/pm2fb.c index 36436ee6c1a4..27f93aab6ddc 100644 --- a/trunk/drivers/video/pm2fb.c +++ b/trunk/drivers/video/pm2fb.c @@ -896,7 +896,7 @@ static int pm2fb_setcolreg(unsigned regno, unsigned red, unsigned green, * Pseudocolor: * uses offset = 0 && length = DAC register width. * var->{color}.offset is 0 - * var->{color}.length contains widht of DAC + * var->{color}.length contains width of DAC * cmap is not used * DAC[X] is programmed to (red, green, blue) * Truecolor: