diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
| commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
| tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /drivers/char/hw_random/octeon-rng.c | |
| parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
| parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'drivers/char/hw_random/octeon-rng.c')
| -rw-r--r-- | drivers/char/hw_random/octeon-rng.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/hw_random/octeon-rng.c b/drivers/char/hw_random/octeon-rng.c index 54b0d9ba65cf..9cd0feca318c 100644 --- a/drivers/char/hw_random/octeon-rng.c +++ b/drivers/char/hw_random/octeon-rng.c @@ -15,6 +15,7 @@ #include <linux/device.h> #include <linux/hw_random.h> #include <linux/io.h> +#include <linux/gfp.h> #include <asm/octeon/octeon.h> #include <asm/octeon/cvmx-rnm-defs.h> |