diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-06 01:48:16 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-06 01:48:16 +0200 |
| commit | 7d1467b5820a384e3e274ee051f44ff749c5ab71 (patch) | |
| tree | 255f0da690b687ba91c338af25f2f031bb471874 | |
| parent | dd1225cc08c3375bf80289ac1965c724881b149a (diff) | |
| parent | 464e7f2fb9e2e54e1eeed48bf17aa29401d875cb (diff) | |
Merge branch 'glamo-2.6.34' into om-gta02-2.6.34
| -rw-r--r-- | drivers/mfd/glamo/glamo-fb.c | 1 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 0eac3ac442b..cffb18032fa 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -980,3 +980,4 @@ module_exit(glamofb_cleanup); MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>"); MODULE_DESCRIPTION("Smedia Glamo 336x/337x framebuffer driver"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:glamo-fb"); diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index f49fa7167aa..aa5312458b1 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -1021,3 +1021,4 @@ module_exit(glamo_mci_exit); MODULE_DESCRIPTION("Glamo MMC/SD Card Interface driver"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Andy Green <andy@openmoko.com>"); +MODULE_ALIAS("platform:glamo-mci"); |