/* * S5K4ECGX image sensor header file * * Copyright (C) 2012, Linaro * Copyright (C) 2012, Samsung Electronics Co., Ltd. * * 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. */ #ifndef S5K4ECGX_H #define S5K4ECGX_H /** * struct s5k4ecgx_gpio - data structure describing a GPIO * @gpio : GPIO number * @level: indicates active state of the @gpio */ struct s5k4ecgx_gpio { int gpio; int level; }; /** * struct ss5k4ecgx_platform_data- s5k4ecgx driver platform data * @gpio_reset: GPIO driving RESET pin * @gpio_stby : GPIO driving STBY pin */ struct s5k4ecgx_platform_data { struct s5k4ecgx_gpio gpio_reset; struct s5k4ecgx_gpio gpio_stby; }; #endif /* S5K4ECGX_H */ ext.git
net-next plumbingsTobias Klauser
summaryrefslogtreecommitdiff
path: root/sound/oss/msnd.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /sound/oss/msnd.h
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/oss/msnd.h')