diff options
author | Colin Cross <ccross@android.com> | 2011-11-14 14:32:16 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-11-14 14:32:16 -0800 |
commit | 9f669fc19d10d21085d45af47fa0256923668b95 (patch) | |
tree | 3e8efa9dfd7d207db9333258c08824bd0a912295 /drivers/misc/Makefile | |
parent | e2136d9545b99ad53f3f0edeb5c426e7b408621c (diff) | |
parent | 9ab6a29787b1221a697f85835645549668258bdc (diff) | |
download | kernel_samsung_espresso10-9f669fc19d10d21085d45af47fa0256923668b95.zip kernel_samsung_espresso10-9f669fc19d10d21085d45af47fa0256923668b95.tar.gz kernel_samsung_espresso10-9f669fc19d10d21085d45af47fa0256923668b95.tar.bz2 |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'drivers/misc/Makefile')
-rw-r--r-- | drivers/misc/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 1b4e7f6..e58c98c 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -22,7 +22,6 @@ obj-$(CONFIG_SENSORS_APDS990X) += apds990x.o obj-$(CONFIG_ANDROID_PMEM) += pmem.o obj-$(CONFIG_SGI_IOC4) += ioc4.o obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o -obj-$(CONFIG_KERNEL_DEBUGGER_CORE) += kernel_debugger.o obj-$(CONFIG_KGDB_TESTS) += kgdbts.o obj-$(CONFIG_SGI_XP) += sgi-xp/ obj-$(CONFIG_SGI_GRU) += sgi-gru/ |