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
This commit is contained in:
commit
501f74f294
|
@ -131,7 +131,9 @@ enum {
|
|||
rng_hw_none,
|
||||
rng_hw_intel,
|
||||
rng_hw_amd,
|
||||
#ifdef __i386__
|
||||
rng_hw_via,
|
||||
#endif
|
||||
rng_hw_geode,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue