diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/i2c/busses/i2c-gpio.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/i2c/busses/i2c-gpio.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index d9aa9a649e35..a651779d9ff7 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c | |||
| @@ -219,7 +219,7 @@ static void __exit i2c_gpio_exit(void) | |||
| 219 | } | 219 | } |
| 220 | module_exit(i2c_gpio_exit); | 220 | module_exit(i2c_gpio_exit); |
| 221 | 221 | ||
| 222 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 222 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
| 223 | MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver"); | 223 | MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver"); |
| 224 | MODULE_LICENSE("GPL"); | 224 | MODULE_LICENSE("GPL"); |
| 225 | MODULE_ALIAS("platform:i2c-gpio"); | 225 | MODULE_ALIAS("platform:i2c-gpio"); |