History

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang: "The main thing is to allow empty id_tables for ACPI to make some drivers get probed again. It looks a bit bigger than usual because it needs some internal renaming, too. Other than that, there is a fix for broken DSTDs, a super simple enablement for ARM MPS, and two documentation fixes which I'd like to see in v4.13 already" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: rephrase explanation of I2C_CLASS_DEPRECATED i2c: allow i2c-versatile for ARM MPS platforms i2c: designware: Some broken DSTDs use 1MiHz instead of 1MHz i2c: designware: Print clock freq on invalid clock freq error i2c: core: Allow empty id_table in ACPI case as well i2c: mux: pinctrl: mention correct module name in Kconfig help text

Linus Torvalds committed 9 years ago

Commit 358f8c22 parents 31cf92f 9c800347 files · +34 −8Browse files

Showing the changes to include/linux (1 of 7 files). Show all

Unified · Split

include/linux/i2c.h+2−1
@@ -689,7 +689,8 @@ i2c_unlock_adapter(struct i2c_adapter *adapter) · 688 unmodified lines
689689 #define I2C_CLASS_HWMON (1<<0) /* lm_sensors, ... */
690690 #define I2C_CLASS_DDC (1<<3) /* DDC bus on graphics adapters */
691691 #define I2C_CLASS_SPD (1<<7) /* Memory modules */
692−#define I2C_CLASS_DEPRECATED (1<<8) /* Warn users that adapter will stop using classes */
692+/* Warn users that the adapter doesn't support classes anymore */
693+#define I2C_CLASS_DEPRECATED (1<<8)
693694
694695 /* Internal numbers to terminate lists */
695696 #define I2C_CLIENT_END 0xfffeU

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t