Merge tag 'disintegrate-tty-20121009' of git://git.infradead.org/users/dhowells/linux-headers into tty-linus

UAPI Disintegration 2012-10-09

2 files changed, 0 insertions, 64 deletions

diff --git a/include/linux/hsi/Kbuild b/include/linux/hsi/Kbuild
index 271a770b4784..e69de29bb2d1 100644
--- a/include/linux/hsi/Kbuild
+++ b/include/linux/hsi/Kbuild
@@ -1 +0,0 @@
-header-y += hsi_char.h
diff --git a/include/linux/hsi/hsi_char.h b/include/linux/hsi/hsi_char.h
deleted file mode 100644
index 76160b4f455d..000000000000
--- a/include/linux/hsi/hsi_char.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Part of the HSI character device driver.
- *
- * Copyright (C) 2010 Nokia Corporation. All rights reserved.
- *
- * Contact: Andras Domokos <andras.domokos at nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-#ifndef __HSI_CHAR_H
-#define __HSI_CHAR_H
-
-#define HSI_CHAR_MAGIC          'k'
-#define HSC_IOW(num, dtype)     _IOW(HSI_CHAR_MAGIC, num, dtype)
-#define HSC_IOR(num, dtype)     _IOR(HSI_CHAR_MAGIC, num, dtype)
-#define HSC_IOWR(num, dtype)    _IOWR(HSI_CHAR_MAGIC, num, dtype)
-#define HSC_IO(num)             _IO(HSI_CHAR_MAGIC, num)
-
-#define HSC_RESET               HSC_IO(16)
-#define HSC_SET_PM              HSC_IO(17)
-#define HSC_SEND_BREAK          HSC_IO(18)
-#define HSC_SET_RX              HSC_IOW(19, struct hsc_rx_config)
-#define HSC_GET_RX              HSC_IOW(20, struct hsc_rx_config)
-#define HSC_SET_TX              HSC_IOW(21, struct hsc_tx_config)
-#define HSC_GET_TX              HSC_IOW(22, struct hsc_tx_config)
-
-#define HSC_PM_DISABLE          0
-#define HSC_PM_ENABLE           1
-
-#define HSC_MODE_STREAM         1
-#define HSC_MODE_FRAME          2
-#define HSC_FLOW_SYNC           0
-#define HSC_ARB_RR              0
-#define HSC_ARB_PRIO            1
-
-struct hsc_rx_config {
-        uint32_t mode;
-        uint32_t flow;
-        uint32_t channels;
-};
-
-struct hsc_tx_config {
-        uint32_t mode;
-        uint32_t channels;
-        uint32_t speed;
-        uint32_t arb_mode;
-};
-
-#endif /* __HSI_CHAR_H */