diff options
| author | Michal Simek <[email protected]> | 2012-03-30 12:10:03 +0200 |
|---|---|---|
| committer | Michal Simek <[email protected]> | 2012-03-30 12:10:03 +0200 |
| commit | 6a4770e335bd4df0a4577146f76e116ab6e23f40 (patch) | |
| tree | 305056c20b6ccf3a4fed00e9e32f3a1dd039cd70 /fs/coda/psdev.c | |
| parent | ac64a9caa55bdfd8d24784f25c68cb7919ddabe3 (diff) | |
| parent | f52b69f86e27903d6896ed5fa7cd280fec8de532 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'fs/coda/psdev.c')
| -rw-r--r-- | fs/coda/psdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index 8f616e0e252c..761d5b31b18d 100644 --- a/fs/coda/psdev.c +++ b/fs/coda/psdev.c @@ -38,7 +38,6 @@ #include <linux/mutex.h> #include <linux/device.h> #include <asm/io.h> -#include <asm/system.h> #include <asm/poll.h> #include <asm/uaccess.h> |