Skip to content

Commit

Permalink
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/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
  • Loading branch information
Linus Torvalds committed Mar 5, 2006
2 parents ea088b8 + 28e02ba commit 501f74f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/char/hw_random.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ enum {
rng_hw_none,
rng_hw_intel,
rng_hw_amd,
#ifdef __i386__
rng_hw_via,
#endif
rng_hw_geode,
};

Expand Down

0 comments on commit 501f74f

Please sign in to comment.