diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-01-08 09:50:22 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-01-08 09:50:22 +0100 |
| commit | 3eb0930a425b086bdab38156aa4708427479a201 (patch) | |
| tree | ea0bceef5bd1f62e4993f8f2f22a81f9da5f1f09 /drivers/isdn/hardware/Makefile | |
| parent | Merge tag 'topic/drmp-cleanup-2019-01-02' of git://anongit.freedesktop.org/dr... (diff) | |
| parent | Linux 5.0-rc1 (diff) | |
| download | linux-3eb0930a425b086bdab38156aa4708427479a201.tar.xz linux-3eb0930a425b086bdab38156aa4708427479a201.zip | |
Merge drm/drm-next into drm-intel-next-queued
Generally catch up with 5.0-rc1, and specifically get the changes:
96d4f267e40f ("Remove 'type' argument from access_ok() function")
0b2c8f8b6b0c ("i915: fix missing user_access_end() in page fault exception case")
594cc251fdd0 ("make 'user_access_begin()' do 'access_ok()'")
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/isdn/hardware/Makefile')
| -rw-r--r-- | drivers/isdn/hardware/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/Makefile b/drivers/isdn/hardware/Makefile index a5d8fce4c4c4..e503032b05a0 100644 --- a/drivers/isdn/hardware/Makefile +++ b/drivers/isdn/hardware/Makefile @@ -3,5 +3,4 @@ # Object files in subdirectories obj-$(CONFIG_CAPI_AVM) += avm/ -obj-$(CONFIG_CAPI_EICON) += eicon/ obj-$(CONFIG_MISDN) += mISDN/ |