diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-16 11:34:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-16 11:34:41 +1000 |
| commit | 38f1cff0863809587b5fd10ecd0c24c8b543a48c (patch) | |
| tree | 7cf6eb88cdc938c3683209d38311e711a1119400 /drivers/i2c/busses/i2c-eg20t.c | |
| parent | 4819d2e4310796c4e9eef674499af9b9caf36b5a (diff) | |
| parent | 5359533801e3dd3abca5b7d3d985b0b33fd9fe8b (diff) | |
| download | linux-38f1cff0863809587b5fd10ecd0c24c8b543a48c.tar.gz linux-38f1cff0863809587b5fd10ecd0c24c8b543a48c.tar.bz2 linux-38f1cff0863809587b5fd10ecd0c24c8b543a48c.zip | |
Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next
This commit changed an internal radeon structure, that meant a new driver
in -next had to be fixed up, merge in the commit and fix up the driver.
Also fixes a trivial nouveau merge.
Conflicts:
drivers/gpu/drm/nouveau/nouveau_mem.c
Diffstat (limited to 'drivers/i2c/busses/i2c-eg20t.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-eg20t.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c index 2e067dd2ee51..50ea1f43bdc1 100644 --- a/drivers/i2c/busses/i2c-eg20t.c +++ b/drivers/i2c/busses/i2c-eg20t.c @@ -29,6 +29,7 @@ #include <linux/pci.h> #include <linux/mutex.h> #include <linux/ktime.h> +#include <linux/slab.h> #define PCH_EVENT_SET 0 /* I2C Interrupt Event Set Status */ #define PCH_EVENT_NONE 1 /* I2C Interrupt Event Clear Status */ |