Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281333
b: refs/heads/master
c: 9d41c5b
h: refs/heads/master
i:
  281331: af549d8
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Greg Kroah-Hartman committed Dec 9, 2011
1 parent 197a2b5 commit 6923bd5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 036f419529d4dd83a1d46de04551d60994d1f372
refs/heads/master: 9d41c5bb07ad97b7777283d7922292f456ba4bfd
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/dac/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ config AD5764
module will be called ad5764.

config AD5791
tristate "Analog Devices AD5760/AD5780/AD5781/AD5791 DAC SPI driver"
tristate "Analog Devices AD5760/AD5780/AD5781/AD5790/AD5791 DAC SPI driver"
depends on SPI
help
Say yes here to build support for Analog Devices AD5760, AD5780,
AD5781, AD5791 High Resolution Voltage Output Digital to
AD5781, AD5790, AD5791 High Resolution Voltage Output Digital to
Analog Converter.

To compile this driver as a module, choose M here: the
Expand Down
6 changes: 4 additions & 2 deletions trunk/drivers/staging/iio/dac/ad5791.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* AD5760, AD5780, AD5781, AD5791 Voltage Output Digital to Analog Converter
* AD5760, AD5780, AD5781, AD5790, AD5791 Voltage Output Digital to Analog
* Converter
*
* Copyright 2011 Analog Devices Inc.
*
Expand Down Expand Up @@ -397,6 +398,7 @@ static const struct spi_device_id ad5791_id[] = {
{"ad5760", ID_AD5760},
{"ad5780", ID_AD5780},
{"ad5781", ID_AD5781},
{"ad5790", ID_AD5791},
{"ad5791", ID_AD5791},
{}
};
Expand Down Expand Up @@ -425,5 +427,5 @@ static __exit void ad5791_spi_exit(void)
module_exit(ad5791_spi_exit);

MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
MODULE_DESCRIPTION("Analog Devices AD5760/AD5780/AD5781/AD5791 DAC");
MODULE_DESCRIPTION("Analog Devices AD5760/AD5780/AD5781/AD5790/AD5791 DAC");
MODULE_LICENSE("GPL v2");

0 comments on commit 6923bd5

Please sign in to comment.