diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-23 15:40:59 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-23 15:40:59 +0200 |
| commit | b8fd949e585e9b991b36f9edc40ebec1a7dd885b (patch) | |
| tree | 64f0f3c789309835cf4a6a8ff3b8f998037e009e /drivers/mfd/glamo/Makefile | |
| parent | 7d86b44375243ab26a58e598fe13bf72d9a5ab48 (diff) | |
| parent | 3951d7043e3002d34780618cfa2ccf378bd14edd (diff) | |
Merge branch 'glamo-2.6.34' into om-gta02-2.6.34
Conflicts:
drivers/gpio/Makefile
Diffstat (limited to 'drivers/mfd/glamo/Makefile')
| -rw-r--r-- | drivers/mfd/glamo/Makefile | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile deleted file mode 100644 index ebf26f7e473..00000000000 --- a/drivers/mfd/glamo/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# Makefile for the Smedia Glamo framebuffer driver -# - -obj-$(CONFIG_MFD_GLAMO) += glamo-core.o -obj-$(CONFIG_MFD_GLAMO_GPIO) += glamo-gpio.o -obj-$(CONFIG_MFD_GLAMO_SPI) += glamo-spi.o - -obj-$(CONFIG_MFD_GLAMO_FB) += glamo-fb.o -obj-$(CONFIG_MFD_GLAMO_MCI) += glamo-mci.o - |