diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/spi/amba-pl022.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/spi/amba-pl022.c')
| -rw-r--r-- | drivers/spi/amba-pl022.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c index 9aeb68113100..e9aeee16d922 100644 --- a/drivers/spi/amba-pl022.c +++ b/drivers/spi/amba-pl022.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/amba/bus.h> | 44 | #include <linux/amba/bus.h> |
| 45 | #include <linux/amba/pl022.h> | 45 | #include <linux/amba/pl022.h> |
| 46 | #include <linux/io.h> | 46 | #include <linux/io.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | 48 | ||
| 48 | /* | 49 | /* |
| 49 | * This macro is used to define some register default values. | 50 | * This macro is used to define some register default values. |