diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/char/drm/ffb_context.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/char/drm/ffb_context.c')
| -rw-r--r-- | drivers/char/drm/ffb_context.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/drm/ffb_context.c b/drivers/char/drm/ffb_context.c index 1383727b443..ac9ab40d57a 100644 --- a/drivers/char/drm/ffb_context.c +++ b/drivers/char/drm/ffb_context.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * for authors. | 7 | * for authors. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/sched.h> | ||
| 11 | #include <asm/upa.h> | 10 | #include <asm/upa.h> |
| 12 | 11 | ||
| 13 | #include "ffb.h" | 12 | #include "ffb.h" |