diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/misc/bmp085.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/misc/bmp085.c')
| -rw-r--r-- | drivers/misc/bmp085.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c index ecd276ad6b19..5f898cb706a6 100644 --- a/drivers/misc/bmp085.c +++ b/drivers/misc/bmp085.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | This driver supports the bmp085 digital barometric pressure | 3 | This driver supports the bmp085 digital barometric pressure |
| 4 | and temperature sensor from Bosch Sensortec. The datasheet | 4 | and temperature sensor from Bosch Sensortec. The datasheet |
| 5 | is avaliable from their website: | 5 | is available from their website: |
| 6 | http://www.bosch-sensortec.com/content/language1/downloads/BST-BMP085-DS000-05.pdf | 6 | http://www.bosch-sensortec.com/content/language1/downloads/BST-BMP085-DS000-05.pdf |
| 7 | 7 | ||
| 8 | A pressure measurement is issued by reading from pressure0_input. | 8 | A pressure measurement is issued by reading from pressure0_input. |
| @@ -429,7 +429,7 @@ static int __devinit bmp085_probe(struct i2c_client *client, | |||
| 429 | if (err) | 429 | if (err) |
| 430 | goto exit_free; | 430 | goto exit_free; |
| 431 | 431 | ||
| 432 | dev_info(&data->client->dev, "Succesfully initialized bmp085!\n"); | 432 | dev_info(&data->client->dev, "Successfully initialized bmp085!\n"); |
| 433 | goto exit; | 433 | goto exit; |
| 434 | 434 | ||
| 435 | exit_free: | 435 | exit_free: |