Skip to content

Commit cc2a0dc

Browse files
committed
oct612x: Use ccflags-y instead of EXTRA_CFLAGS.
ccflags-y was added to the kernel back in 2007, in commit f77bf01425b11947eeb3b5b54. Recent kernel commit dbd83ea09699390892e5efecddd74ae43a00f071 has now completely removed the deprecated EXTRA_CFLAGS. Comments in Kbuild and the Makefile for the oct612x library were added back when it was created in 2013 in commit f65299e to use the newer ccflags-y based on the kernel version, but the change was never made to conditionally move away from the EXTRA_CFLAGS. Now that the older way no longer exists, always use ccflags-y. Resolves: #76
1 parent d932d9f commit cc2a0dc

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

drivers/dahdi/oct612x/Kbuild

+1-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ octapi_files = octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.o \
2424
apilib/llman/octapi_llman.o \
2525
oct612x-user.o
2626

27-
# TODO: ccflags was added in 2.6.24 in commit f77bf01425b11947eeb3b5b54. This
28-
# should be changed to a conditional compilation based on the Kernel Version.
29-
# ccflags-y := -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api
30-
EXTRA_CFLAGS = -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api
27+
ccflags-y := -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api
3128
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_OCT612X) := oct612x.o
3229
oct612x-objs := $(octapi_files)

drivers/dahdi/oct612x/Makefile

+1-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,5 @@ octapi_files = octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.o \
2323
apilib/largmath/octapi_largmath.o \
2424
apilib/llman/octapi_llman.o
2525

26-
# TODO: ccflags was added in 2.6.24 in commit f77bf01425b11947eeb3b5b54. This
27-
# should be changed to a conditional compilation based on the Kernel Version.
28-
# ccflags-y := -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api
29-
EXTRA_CFLAGS = -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api
26+
ccflags-y := -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api
3027
lib-y := $(octapi_files)

0 commit comments

Comments
 (0)