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.

Also, Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>

authored by Tracey Dent and committed by Sage Weil 582c86e6 dc69e2e9

+1 -22
+1 -22
fs/ceph/Makefile
··· 2 2 # Makefile for CEPH filesystem. 3 3 # 4 4 5 - ifneq ($(KERNELRELEASE),) 6 - 7 5 obj-$(CONFIG_CEPH_FS) += ceph.o 8 6 9 - ceph-objs := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ 7 + ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ 10 8 export.o caps.o snap.o xattr.o \ 11 9 mds_client.o mdsmap.o strings.o ceph_frag.o \ 12 10 debugfs.o 13 11 14 - else 15 - #Otherwise we were called directly from the command 16 - # line; invoke the kernel build system. 17 - 18 - KERNELDIR ?= /lib/modules/$(shell uname -r)/build 19 - PWD := $(shell pwd) 20 - 21 - default: all 22 - 23 - all: 24 - $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_FS=m modules 25 - 26 - modules_install: 27 - $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_FS=m modules_install 28 - 29 - clean: 30 - $(MAKE) -C $(KERNELDIR) M=$(PWD) clean 31 - 32 - endif