diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:22 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:22 -0500 |
commit | 8c82da5e2495589b7b70a43789e7cbd61a486ed0 (patch) | |
tree | fdde7380d2584d0297898373831f26cd5208cabd /drivers/mmc | |
parent | 51badebdcf394cc5fd574a524b55b3f6085e5e9c (diff) | |
parent | 6d5355998a757a16815d58da4a739b15a6efbfba (diff) |
Merge commit 'gcl/next' into next
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/of_mmc_spi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c index 0c44d560bf1a..0c7a63c1f12f 100644 --- a/drivers/mmc/host/of_mmc_spi.c +++ b/drivers/mmc/host/of_mmc_spi.c | |||
@@ -22,6 +22,8 @@ | |||
22 | #include <linux/mmc/core.h> | 22 | #include <linux/mmc/core.h> |
23 | #include <linux/mmc/host.h> | 23 | #include <linux/mmc/host.h> |
24 | 24 | ||
25 | MODULE_LICENSE("GPL"); | ||
26 | |||
25 | enum { | 27 | enum { |
26 | CD_GPIO = 0, | 28 | CD_GPIO = 0, |
27 | WP_GPIO, | 29 | WP_GPIO, |