diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-01 09:28:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-01 09:28:58 +0100 |
| commit | e2f4699ac15fe36de1288505bc6e6e5a8603ab1b (patch) | |
| tree | 8078d3ff21eaa0a0ed6e446ac94f3681e831cad1 /drivers/char/hw_random/Makefile | |
| parent | 1883c79a57a5fe25309007590cccb1b2782c41b2 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
| download | op-kernel-dev-e2f4699ac15fe36de1288505bc6e6e5a8603ab1b.zip op-kernel-dev-e2f4699ac15fe36de1288505bc6e6e5a8603ab1b.tar.gz | |
Merge branch 'linus' into core/rcu
Merge reason: Backmerge latest upstream to queue up dependent fix in the
scheduler.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/hw_random/Makefile')
| -rw-r--r-- | drivers/char/hw_random/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile index 5eeb130..4273308 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -18,3 +18,4 @@ obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o obj-$(CONFIG_HW_RANDOM_MXC_RNGA) += mxc-rnga.o obj-$(CONFIG_HW_RANDOM_OCTEON) += octeon-rng.o +obj-$(CONFIG_HW_RANDOM_NOMADIK) += nomadik-rng.o |
