diff options
author | Andrew Morton <akpm@osdl.org> | 2006-01-08 04:04:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:14:02 -0500 |
commit | a1365647022eb05a5993f270a78e9bef3bf554eb (patch) | |
tree | 6dbcab4db80b7d07fdaec88c003743d1f6e1a289 /drivers | |
parent | fd285bb54d8a3e99810090ae88cfe8ed77d1da25 (diff) |
[PATCH] remove gcc-2 checks
Remove various things which were checking for gcc-1.x and gcc-2.x compilers.
From: Adrian Bunk <bunk@stusta.de>
Some documentation updates and removes some code paths for gcc < 3.2.
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/md/raid0.c | 6 | ||||
-rw-r--r-- | drivers/media/video/v4l2-common.c | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index abbca150202b..d03f99cf4b7d 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c | |||
@@ -306,9 +306,6 @@ static int raid0_run (mddev_t *mddev) | |||
306 | printk("raid0 : conf->hash_spacing is %llu blocks.\n", | 306 | printk("raid0 : conf->hash_spacing is %llu blocks.\n", |
307 | (unsigned long long)conf->hash_spacing); | 307 | (unsigned long long)conf->hash_spacing); |
308 | { | 308 | { |
309 | #if __GNUC__ < 3 | ||
310 | volatile | ||
311 | #endif | ||
312 | sector_t s = mddev->array_size; | 309 | sector_t s = mddev->array_size; |
313 | sector_t space = conf->hash_spacing; | 310 | sector_t space = conf->hash_spacing; |
314 | int round; | 311 | int round; |
@@ -439,9 +436,6 @@ static int raid0_make_request (request_queue_t *q, struct bio *bio) | |||
439 | 436 | ||
440 | 437 | ||
441 | { | 438 | { |
442 | #if __GNUC__ < 3 | ||
443 | volatile | ||
444 | #endif | ||
445 | sector_t x = block >> conf->preshift; | 439 | sector_t x = block >> conf->preshift; |
446 | sector_div(x, (u32)conf->hash_spacing); | 440 | sector_div(x, (u32)conf->hash_spacing); |
447 | zone = conf->hash_table[x]; | 441 | zone = conf->hash_table[x]; |
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 597b8db35a13..62a7d636ef11 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
@@ -191,9 +191,7 @@ char *v4l2_type_names[] = { | |||
191 | }; | 191 | }; |
192 | 192 | ||
193 | char *v4l2_ioctl_names[256] = { | 193 | char *v4l2_ioctl_names[256] = { |
194 | #if __GNUC__ >= 3 | ||
195 | [0 ... 255] = "UNKNOWN", | 194 | [0 ... 255] = "UNKNOWN", |
196 | #endif | ||
197 | [_IOC_NR(VIDIOC_QUERYCAP)] = "VIDIOC_QUERYCAP", | 195 | [_IOC_NR(VIDIOC_QUERYCAP)] = "VIDIOC_QUERYCAP", |
198 | [_IOC_NR(VIDIOC_RESERVED)] = "VIDIOC_RESERVED", | 196 | [_IOC_NR(VIDIOC_RESERVED)] = "VIDIOC_RESERVED", |
199 | [_IOC_NR(VIDIOC_ENUM_FMT)] = "VIDIOC_ENUM_FMT", | 197 | [_IOC_NR(VIDIOC_ENUM_FMT)] = "VIDIOC_ENUM_FMT", |