From patchwork Tue Dec 14 10:09:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Chinea X-Patchwork-Id: 409301 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBEAAVkT022088 for ; Tue, 14 Dec 2010 10:10:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932179Ab0LNKJW (ORCPT ); Tue, 14 Dec 2010 05:09:22 -0500 Received: from smtp.nokia.com ([147.243.1.48]:52265 "EHLO mgw-sa02.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932131Ab0LNKJT (ORCPT ); Tue, 14 Dec 2010 05:09:19 -0500 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id oBEA9HhP030682; Tue, 14 Dec 2010 12:09:17 +0200 Received: from groo.research.nokia.com ([esdhcp034188.research.nokia.com [172.21.34.188]]) by mgw-sa02.nokia.com with RELAY id oBEA93ik030299 ; Tue, 14 Dec 2010 12:09:06 +0200 From: Carlos Chinea To: linux-kernel@vger.kernel.org Cc: linux-omap@vger.kernel.org, Andras Domokos Subject: [RFC PATCHv4 7/7] HSI: hsi_char: Update ioctl-number.txt Date: Tue, 14 Dec 2010 12:09:43 +0200 Message-Id: <1292321383-30200-8-git-send-email-carlos.chinea@nokia.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1292321383-30200-1-git-send-email-carlos.chinea@nokia.com> References: <1292321383-30200-1-git-send-email-carlos.chinea@nokia.com> X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Dec 2010 10:10:52 +0000 (UTC) diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 63ffd78..955bf5e 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -225,6 +225,7 @@ Code Seq#(hex) Include File Comments 'j' 00-3F linux/joystick.h 'k' 00-0F linux/spi/spidev.h conflict! 'k' 00-05 video/kyro.h conflict! +'k' 10-17 linux/hsi/hsi_char.h HSI character device 'l' 00-3F linux/tcfs_fs.h transparent cryptographic file system 'l' 40-7F linux/udf_fs_i.h in development: