diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/hw_random.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/hw_random.h')
| -rw-r--r-- | include/linux/hw_random.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h index 85d11916e9ea..7244456e7e65 100644 --- a/include/linux/hw_random.h +++ b/include/linux/hw_random.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #ifndef LINUX_HWRANDOM_H_ | 12 | #ifndef LINUX_HWRANDOM_H_ |
| 13 | #define LINUX_HWRANDOM_H_ | 13 | #define LINUX_HWRANDOM_H_ |
| 14 | #ifdef __KERNEL__ | ||
| 15 | 14 | ||
| 16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 17 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| @@ -46,5 +45,4 @@ extern int hwrng_register(struct hwrng *rng); | |||
| 46 | /** Unregister a Hardware Random Number Generator driver. */ | 45 | /** Unregister a Hardware Random Number Generator driver. */ |
| 47 | extern void hwrng_unregister(struct hwrng *rng); | 46 | extern void hwrng_unregister(struct hwrng *rng); |
| 48 | 47 | ||
| 49 | #endif /* __KERNEL__ */ | ||
| 50 | #endif /* LINUX_HWRANDOM_H_ */ | 48 | #endif /* LINUX_HWRANDOM_H_ */ |