Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 501f74f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ea088b8d 28e02bac

drivers/char/hw_random.c

+2 −0
Original line number Diff line number Diff line
@@ -131,7 +131,9 @@ enum { 
	rng_hw_none,

	rng_hw_intel,

	rng_hw_amd,

#ifdef __i386__

	rng_hw_via,

#endif

	rng_hw_geode,

};