diff options
| author |   Paul Mackerras <paulus@samba.org> | 2007-12-05 16:13:25 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-05 16:13:25 +1100 |
| commit | cc1bf182bb8451a036a7c227f0a95a0416c4736e (patch) | |
| tree | e41508d28079bc599faf2604b7d9fa4e828f616a /drivers/char | |
| parent | [POWERPC] Add missing spaces in printk formats in arch/ppc (diff) | |
| parent | [POWERPC] pasemi: Fix module information for gpio-mdio (diff) | |
| download | linux-dev-cc1bf182bb8451a036a7c227f0a95a0416c4736e.tar.xz linux-dev-cc1bf182bb8451a036a7c227f0a95a0416c4736e.zip | |
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasemi into for-2.6.25
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hw_random/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/char/hw_random/pasemi-rng.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 2d7cd486e025..6bbd4fa50f3b 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -98,7 +98,7 @@ config HW_RANDOM_PASEMI default HW_RANDOM ---help--- This driver provides kernel-side support for the Random Number - Generator hardware found on PA6T-1682M processor. + Generator hardware found on PA Semi PWRficient SoCs. To compile this driver as a module, choose M here: the module will be called pasemi-rng. diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c index fa6040b6c8f2..24ae3073991f 100644 --- a/drivers/char/hw_random/pasemi-rng.c +++ b/drivers/char/hw_random/pasemi-rng.c @@ -126,10 +126,9 @@ static int __devexit rng_remove(struct of_device *dev) } static struct of_device_id rng_match[] = { - { - .compatible = "1682m-rng", - }, - {}, + { .compatible = "1682m-rng", }, + { .compatible = "pasemi,pwrficient-rng", }, + { }, }; static struct of_platform_driver rng_driver = { |