diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /drivers/char/hw_random.c | |
parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/char/hw_random.c')
-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 b3bc2e37e616..29dc87e59020 100644 --- a/drivers/char/hw_random.c +++ b/drivers/char/hw_random.c | |||
@@ -131,7 +131,9 @@ enum { | |||
131 | rng_hw_none, | 131 | rng_hw_none, |
132 | rng_hw_intel, | 132 | rng_hw_intel, |
133 | rng_hw_amd, | 133 | rng_hw_amd, |
134 | #ifdef __i386__ | ||
134 | rng_hw_via, | 135 | rng_hw_via, |
136 | #endif | ||
135 | rng_hw_geode, | 137 | rng_hw_geode, |
136 | }; | 138 | }; |
137 | 139 | ||