diff options
| author | Tracey Dent <tdent48227@gmail.com> | 2010-11-21 16:23:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-28 02:39:29 +0100 |
| commit | 4cb6a614ba0e58cae8abdadbf73bcb4d37a3f599 (patch) | |
| tree | 09198ec9e4bbb9c751246d38db87da970a7740aa | |
| parent | econet: fix CVE-2010-3848 (diff) | |
| download | linux-4cb6a614ba0e58cae8abdadbf73bcb4d37a3f599.tar.xz linux-4cb6a614ba0e58cae8abdadbf73bcb4d37a3f599.zip | |
Net: ceph: Makefile: Remove unnessary code
Remove the if and else conditional because the code is in mainline and there
is no need in it being there.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ceph/Makefile | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/net/ceph/Makefile b/net/ceph/Makefile index aab1cabb8035..5f19415ec9c0 100644 --- a/net/ceph/Makefile +++ b/net/ceph/Makefile @@ -1,9 +1,6 @@ # # Makefile for CEPH filesystem. # - -ifneq ($(KERNELRELEASE),) - obj-$(CONFIG_CEPH_LIB) += libceph.o libceph-objs := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \ @@ -16,22 +13,3 @@ libceph-objs := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \ ceph_fs.o ceph_strings.o ceph_hash.o \ pagevec.o -else -#Otherwise we were called directly from the command -# line; invoke the kernel build system. - -KERNELDIR ?= /lib/modules/$(shell uname -r)/build -PWD := $(shell pwd) - -default: all - -all: - $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_LIB=m modules - -modules_install: - $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_LIB=m modules_install - -clean: - $(MAKE) -C $(KERNELDIR) M=$(PWD) clean - -endif |