diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-04 18:51:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-04 18:51:45 -0800 |
| commit | 501f74f29498543c27f4f9697f5c1e980dd2de0d (patch) | |
| tree | a73666df60eea38aaf0ee8f9a48adef5ae30e3e7 | |
| parent | ea088b8d481fcff001f7e628c44daf39a229d9fc (diff) | |
| parent | 28e02bac9c943ed85a29b41ccb9bf95641b2e263 (diff) | |
| download | kernel_samsung_aries-501f74f29498543c27f4f9697f5c1e980dd2de0d.zip kernel_samsung_aries-501f74f29498543c27f4f9697f5c1e980dd2de0d.tar.gz kernel_samsung_aries-501f74f29498543c27f4f9697f5c1e980dd2de0d.tar.bz2 | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[PATCH] Add missing ifdef for VIA RNG code
| -rw-r--r-- | drivers/char/hw_random.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/hw_random.c b/drivers/char/hw_random.c index b3bc2e3..29dc87e 100644 --- a/drivers/char/hw_random.c +++ b/drivers/char/hw_random.c @@ -131,7 +131,9 @@ enum { rng_hw_none, rng_hw_intel, rng_hw_amd, +#ifdef __i386__ rng_hw_via, +#endif rng_hw_geode, }; |