diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-09 11:14:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-09 11:14:30 -0700 |
| commit | 1329c20433fb1298dd0bf94b59c1a11f27a1f2e2 (patch) | |
| tree | 5aae67e8fe5170f88323d6d8304f625bd883b05b /drivers/char/Makefile | |
| parent | d6c7528447dec208f9b742ede047753584528c0a (diff) | |
| parent | 1c1ff29da6c86864e73b05d4301a2df1d161f2da (diff) | |
| download | linux-1329c20433fb1298dd0bf94b59c1a11f27a1f2e2.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
- a FPE signal fix that was also merged upstream
- privileged ADI driver from Tom Hromatka
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: fix compat siginfo ABI regression
selftests: sparc64: char: Selftest for privileged ADI driver
char: sparc64: Add privileged ADI driver
Diffstat (limited to 'drivers/char/Makefile')
| -rw-r--r-- | drivers/char/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index c97c768cd1dd..b8d42b4e979b 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -57,3 +57,4 @@ js-rtc-y = rtc.o obj-$(CONFIG_XILLYBUS) += xillybus/ obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o +obj-$(CONFIG_ADI) += adi.o |