diff -urNp a/drivers/char/Kconfig b/drivers/char/Kconfig
--- a/drivers/char/Kconfig	2016-05-16 00:43:13.000000000 +0200
+++ b/drivers/char/Kconfig	2016-06-08 20:41:14.047205734 +0200
@@ -6,6 +6,16 @@ menu "Character devices"
 
 source "drivers/tty/Kconfig"
 
+config HELLO
+	tristate "hello demo driver"
+	default n
+	help
+	  This driver demonstrates how to create a platform device that is
+	  specified in a device tree.
+
+	  It also create a character device to demonstrate how a character
+	  device interface can be provided to userspace.
+
 config DEVMEM
 	bool "/dev/mem virtual device support"
 	default y
diff -urNp a/drivers/char/Makefile b/drivers/char/Makefile
--- a/drivers/char/Makefile	2016-05-16 00:43:13.000000000 +0200
+++ b/drivers/char/Makefile	2016-06-08 14:16:44.897437533 +0200
@@ -16,6 +16,8 @@ obj-$(CONFIG_IBM_BSR)		+= bsr.o
 obj-$(CONFIG_SGI_MBCS)		+= mbcs.o
 obj-$(CONFIG_BFIN_OTP)		+= bfin-otp.o
 
+obj-$(CONFIG_HELLO)		+= hello.o
+
 obj-$(CONFIG_PRINTER)		+= lp.o
 
 obj-$(CONFIG_APM_EMULATION)	+= apm-emulation.o