diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/char/pcmcia/Makefile | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/char/pcmcia/Makefile')
| -rw-r--r-- | drivers/char/pcmcia/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/pcmcia/Makefile b/drivers/char/pcmcia/Makefile index 1fcd4c591958..0aae20985d57 100644 --- a/drivers/char/pcmcia/Makefile +++ b/drivers/char/pcmcia/Makefile | |||
| @@ -5,3 +5,5 @@ | |||
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o | 7 | obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o |
| 8 | obj-$(CONFIG_CARDMAN_4000) += cm4000_cs.o | ||
| 9 | obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o | ||