diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 09:59:36 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 09:59:36 +0200 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /drivers/memstick/host/Makefile | |
| parent | percpu: Always align percpu output section to PAGE_SIZE (diff) | |
| parent | percpu: Unify input section names (diff) | |
| download | linux-6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0.tar.xz linux-6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0.zip | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'drivers/memstick/host/Makefile')
| -rw-r--r-- | drivers/memstick/host/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/memstick/host/Makefile b/drivers/memstick/host/Makefile index a1815e9dd019..31ba8d378e46 100644 --- a/drivers/memstick/host/Makefile +++ b/drivers/memstick/host/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o +obj-$(CONFIG_MEMSTICK_R592) += r592.o |