diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 05:41:26 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 05:41:26 +0400 |
| commit | 123df7ae0d0ed90d01ef4cb7316fa0b7ef0ec8a8 (patch) | |
| tree | 85eea4f489152f0559abfcfeb94d100ef446278b /drivers/i2c/busses/i2c-piix4.c | |
| parent | 9b690c3d56ce15dd265b6398f9d8d58c29c17032 (diff) | |
| parent | a1681781da691a95c2277d9dbd7f5962b6b9e368 (diff) | |
| download | linux-123df7ae0d0ed90d01ef4cb7316fa0b7ef0ec8a8.tar.xz | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull i2c update from Jean Delvare:
"This is my last pull request for the i2c subsystem. It includes all
the patches I collected between kernel v3.7-rc1 and me passing i2c
maintenance duties over to Wolfram.
Future patches to the many i2c bus drivers I still maintain will go
through Wolfram's tree."
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Mention functionality flags in SMBus protocol documentation
i2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
i2c-i801: Enable interrupts for all post-ICH5 chips
i2c-i801: Add device tree support
MAINTAINERS: Fix drivers/i2c/busses/i2c-stub.c
Diffstat (limited to 'drivers/i2c/busses/i2c-piix4.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-piix4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 8bbd6ece7c41..f7216ed2f3a9 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -204,9 +204,8 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, */ pci_write_config_byte(PIIX4_dev, SMBHSTCFG, temp | 1); - dev_printk(KERN_NOTICE, &PIIX4_dev->dev, - "WARNING: SMBus interface has been " - "FORCEFULLY ENABLED!\n"); + dev_notice(&PIIX4_dev->dev, + "WARNING: SMBus interface has been FORCEFULLY ENABLED!\n"); } else { dev_err(&PIIX4_dev->dev, "Host SMBus controller not enabled!\n"); |