Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
d1244aa9
Commit
d1244aa9
authored
Jun 29, 2005
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARM: OMAP: Temporary patch to avoid merge conflicts
Temporary patch to avoid merge conflicts
parent
eeabf01f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
19 deletions
+1
-19
drivers/Kconfig
drivers/Kconfig
+0
-2
drivers/char/watchdog/Makefile
drivers/char/watchdog/Makefile
+0
-1
drivers/i2c/chips/Kconfig
drivers/i2c/chips/Kconfig
+0
-13
drivers/i2c/chips/Makefile
drivers/i2c/chips/Makefile
+0
-2
drivers/net/smc91x.h
drivers/net/smc91x.h
+1
-1
No files found.
drivers/Kconfig
View file @
d1244aa9
...
...
@@ -60,6 +60,4 @@ source "drivers/infiniband/Kconfig"
source "drivers/sn/Kconfig"
source "drivers/ssi/Kconfig"
endmenu
drivers/char/watchdog/Makefile
View file @
d1244aa9
...
...
@@ -34,7 +34,6 @@ obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
obj-$(CONFIG_IXP2000_WATCHDOG)
+=
ixp2000_wdt.o
obj-$(CONFIG_8xx_WDT)
+=
mpc8xx_wdt.o
obj-$(CONFIG_WATCHDOG_RTAS)
+=
wdrtas.o
obj-$(CONFIG_OMAP16XX_WATCHDOG)
+=
omap1610_wdt.o
# Only one watchdog can succeed. We probe the hardware watchdog
# drivers first, then the softdog driver. This means if your hardware
...
...
drivers/i2c/chips/Kconfig
View file @
d1244aa9
...
...
@@ -509,19 +509,6 @@ config TPS65010
This driver can also be built as a module. If so, the module
will be called tps65010.
config SENSORS_TLV320AIC23
tristate "Texas Instruments TLV320AIC23 Codec"
depends on I2C && I2C_OMAP
help
If you say yes here you get support for the I2C control
interface for Texas Instruments TLV320AIC23 audio codec.
config GPIOEXPANDER_OMAP
bool "GPIO Expander PCF8574PWR for OMAP"
depends on I2C && ARCH_OMAP16XX
help
If you say yes here you get support for I/O expander calls
to configure IrDA, Camera and audio devices endmenu
config SENSORS_M41T00
tristate "ST M41T00 RTC chip"
...
...
drivers/i2c/chips/Makefile
View file @
d1244aa9
...
...
@@ -49,8 +49,6 @@ obj-$(CONFIG_SENSORS_W83L785TS) += w83l785ts.o
obj-$(CONFIG_ISP1301_OMAP)
+=
isp1301_omap.o
obj-$(CONFIG_TPS65010)
+=
tps65010.o
obj-$(CONFIG_SENSORS_TLV320AIC23)
+=
tlv320aic23.o
obj-$(CONFIG_GPIOEXPANDER_OMAP)
+=
gpio_expander_omap.o
ifeq
($(CONFIG_I2C_DEBUG_CHIP),y)
EXTRA_CFLAGS
+=
-DDEBUG
...
...
drivers/net/smc91x.h
View file @
d1244aa9
...
...
@@ -188,7 +188,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
#define SMC_IRQ_TRIGGER_TYPE (( \
machine_is_omap_h2() \
|| machine_is_omap_h3() \
|| (machine_is_omap_innovator() && !cpu_is_omap15
1
0()) \
|| (machine_is_omap_innovator() && !cpu_is_omap150()) \
) ? IRQT_FALLING : IRQT_RISING)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment