diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-12-16 15:53:52 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-12-16 15:53:52 +0100 |
| commit | d09476018bee39495d6ece7a2e069de29a9c0ed5 (patch) | |
| tree | 866fff4323f94681e6b423f269f0549df0a34066 /drivers/char/hw_random/pseries-rng.c | |
| parent | 337bb336b95bd7884fa3a194eafbdf52a0216b2e (diff) | |
| parent | afdcd431cebe3498db9aa963c780fdd5099917ec (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/char/hw_random/pseries-rng.c')
| -rw-r--r-- | drivers/char/hw_random/pseries-rng.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/hw_random/pseries-rng.c b/drivers/char/hw_random/pseries-rng.c index b761459a343..ab7ffdec0ec 100644 --- a/drivers/char/hw_random/pseries-rng.c +++ b/drivers/char/hw_random/pseries-rng.c @@ -24,7 +24,6 @@ #include <linux/hw_random.h> #include <asm/vio.h> -#define MODULE_NAME "pseries-rng" static int pseries_rng_data_read(struct hwrng *rng, u32 *data) { @@ -55,7 +54,7 @@ static unsigned long pseries_rng_get_desired_dma(struct vio_dev *vdev) }; static struct hwrng pseries_rng = { - .name = MODULE_NAME, + .name = KBUILD_MODNAME, .data_read = pseries_rng_data_read, }; @@ -78,7 +77,7 @@ static struct vio_device_id pseries_rng_driver_ids[] = { MODULE_DEVICE_TABLE(vio, pseries_rng_driver_ids); static struct vio_driver pseries_rng_driver = { - .name = MODULE_NAME, + .name = KBUILD_MODNAME, .probe = pseries_rng_probe, .remove = pseries_rng_remove, .get_desired_dma = pseries_rng_get_desired_dma, |