summaryrefslogtreecommitdiff
path: root/drivers/char/hw_random/ixp4xx-rng.c
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-12-13 02:13:32 +0300
committerDave Jones <davej@redhat.com>2006-12-13 02:13:32 +0300
commitf0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch)
tree2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/char/hw_random/ixp4xx-rng.c
parent0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff)
parente1036502e5263851259d147771226161e5ccc85a (diff)
downloadlinux-f0eef25339f92f7cd4aeea23d9ae97987a5a1e82.tar.xz
Merge ../linus
Diffstat (limited to 'drivers/char/hw_random/ixp4xx-rng.c')
-rw-r--r--drivers/char/hw_random/ixp4xx-rng.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/hw_random/ixp4xx-rng.c b/drivers/char/hw_random/ixp4xx-rng.c
index ef71022423c9..c9caff57db85 100644
--- a/drivers/char/hw_random/ixp4xx-rng.c
+++ b/drivers/char/hw_random/ixp4xx-rng.c
@@ -1,5 +1,5 @@
/*
- * drivers/char/rng/ixp4xx-rng.c
+ * drivers/char/hw_random/ixp4xx-rng.c
*
* RNG driver for Intel IXP4xx family of NPUs
*
@@ -15,7 +15,6 @@
*/
#include <linux/kernel.h>
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/moduleparam.h>