mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +00:00
26ec99b105
The mwave driver has its own macros for the BOOLEAN type and the
TRUE/FALSE values. This is redundant because the kernel already
has bool/true/false, and it clashes with the ACPI headers that
also define these types. The linux/acpi.h header is now included
implicitly from mwave through the mc146818rtc.h header, as
reported by Stephen Rothwell:
In file included from drivers/char/mwave/smapi.c:51:0:
drivers/char/mwave/smapi.h:52:0: warning: "TRUE" redefined
#define TRUE 1
^
In file included from include/acpi/acpi.h:58:0,
from include/linux/acpi.h:33,
from include/linux/mc146818rtc.h:21,
from drivers/char/mwave/smapi.c:50:
include/acpi/actypes.h:438:0: note: this is the location of the previous definition
#define TRUE (1 == 1)
^
This removes the private types from mwave and uses the standard
types instead.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Fixes: fd09cc80165c ("rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
77 lines
2.7 KiB
C
77 lines
2.7 KiB
C
/*
|
|
*
|
|
* smapi.h -- declarations for SMAPI interface routines
|
|
*
|
|
*
|
|
* Written By: Mike Sullivan IBM Corporation
|
|
*
|
|
* Copyright (C) 1999 IBM Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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.
|
|
*
|
|
* NO WARRANTY
|
|
* THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
|
|
* CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT
|
|
* LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
|
|
* solely responsible for determining the appropriateness of using and
|
|
* distributing the Program and assumes all risks associated with its
|
|
* exercise of rights under this Agreement, including but not limited to
|
|
* the risks and costs of program errors, damage to or loss of data,
|
|
* programs or equipment, and unavailability or interruption of operations.
|
|
*
|
|
* DISCLAIMER OF LIABILITY
|
|
* NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
|
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
|
|
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
|
* USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
|
|
* HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES
|
|
*
|
|
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*
|
|
* 10/23/2000 - Alpha Release
|
|
* First release to the public
|
|
*/
|
|
|
|
#ifndef _LINUX_SMAPI_H
|
|
#define _LINUX_SMAPI_H
|
|
|
|
typedef struct {
|
|
int bDSPPresent;
|
|
int bDSPEnabled;
|
|
int bModemEnabled;
|
|
int bMIDIEnabled;
|
|
int bSblstEnabled;
|
|
unsigned short usDspIRQ;
|
|
unsigned short usDspDMA;
|
|
unsigned short usDspBaseIO;
|
|
unsigned short usUartIRQ;
|
|
unsigned short usUartBaseIO;
|
|
unsigned short usMidiIRQ;
|
|
unsigned short usMidiBaseIO;
|
|
unsigned short usSndblstIRQ;
|
|
unsigned short usSndblstDMA;
|
|
unsigned short usSndblstBaseIO;
|
|
} SMAPI_DSP_SETTINGS;
|
|
|
|
int smapi_init(void);
|
|
int smapi_query_DSP_cfg(SMAPI_DSP_SETTINGS * pSettings);
|
|
int smapi_set_DSP_cfg(void);
|
|
int smapi_set_DSP_power_state(bool bOn);
|
|
|
|
|
|
#endif
|