diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 13:15:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 13:47:38 -0800 |
| commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
| tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /net/ceph/Makefile | |
| parent | f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 (diff) | |
| parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
Diffstat (limited to 'net/ceph/Makefile')
| -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 153bdec40835..e87ef435e11b 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-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \ @@ -16,22 +13,3 @@ libceph-y := 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 |