diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 17:06:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 17:06:53 -0800 |
| commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
| tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /drivers/video | |
| parent | dbc1651f0c5b7d13acc59d3b805a7224332fb1fb (diff) | |
| parent | b3c29d85bf0dcce9e99cbfba2811aeefae017aaa (diff) | |
| download | linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/aty/radeon_monitor.c | 2 | ||||
| -rw-r--r-- | drivers/video/logo/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c index ea7c863069184..7f9838dceab50 100644 --- a/drivers/video/aty/radeon_monitor.c +++ b/drivers/video/aty/radeon_monitor.c @@ -423,7 +423,7 @@ static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo, /* * Probe display on both primary and secondary card's connector (if any) * by various available techniques (i2c, OF device tree, BIOS, ...) and - * try to retreive EDID. The algorithm here comes from XFree's radeon + * try to retrieve EDID. The algorithm here comes from XFree's radeon * driver */ void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index d0244c04af5a7..4ef5cd19609d6 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o # How to generate logo's -# Use logo-cfiles to retreive list of .c files to be built +# Use logo-cfiles to retrieve list of .c files to be built logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \ $(wildcard $(srctree)/$(src)/*$(1).$(2)))) |