Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  HOWTO: update misspelling and word incorrected
  add stable_api_nonsense.txt in korean
  HOWTO: change addresses of maintainer and lxr url for Korean HOWTO
  Add Documentation for FAIR_USER_SCHED sysfs files
  HOWTO: Change man-page maintainer address for Japanese HOWTO
  tipar: remove obsolete module
  kobject: fix the documentation of how kobject_set_name works

1 files changed, 0 insertions, 22 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a509b8d79781..ef1ed5d70125 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -543,28 +543,6 @@ config PPDEV
 
           If unsure, say N.
 
-config TIPAR
-        tristate "Texas Instruments parallel link cable support"
-        depends on PARPORT
-        ---help---
-          If you own a Texas Instruments graphing calculator and use a
-          parallel link cable, then you might be interested in this driver.
-
-          If you enable this driver, you will be able to communicate with
-          your calculator through a set of device nodes under /dev. The
-          main advantage of this driver is that you don't have to be root
-          to use this precise link cable (depending on the permissions on
-          the device nodes, though).
-
-          To compile this driver as a module, choose M here: the
-          module will be called tipar.
-
-          If you don't know what a parallel link cable is or what a Texas
-          Instruments graphing calculator is, then you probably don't need this
-          driver.
-
-          If unsure, say N.
-
 config HVC_DRIVER
         bool
         help